Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet' into exper...
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 18:34:07 +0000 (19:34 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 18:34:07 +0000 (19:34 +0100)
commitdc5629b2e25dfa0e0bfba45eba44c5d7385399bf
tree8b8da3f876d81a6465fc6846f640d81019b3929a
parente132702d11760f926735d7d59da1b48006cf549a
parentdd3cf818ebef5c080a8d49f6663200d284840974
Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet' into experimental
lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py