Merge remote branch 'origin/bug_347_adenin_unicable_xml'
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:47:10 +0000 (12:47 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 6 Oct 2010 10:47:10 +0000 (12:47 +0200)
commit739c64ceb1cad3f9fcf1e85be88bf3faad13c534
treeae30b7b8e61eb72058aa788b650d270a704e7e2c
parentbef10bca5a6d32cf779179c2836459ce632db98f
parent6ef6ef31af71b1c4065cd5281d3a711c3b4dc2ae
Merge remote branch 'origin/bug_347_adenin_unicable_xml'
lib/dvb/frontend.cpp
lib/dvb/idvb.h
lib/python/Components/NimManager.py
lib/python/Components/config.py
lib/python/Screens/Satconfig.py