Merge branch 'bug_453_multiepg_no_more_ask_bouquet' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 17 Mar 2011 17:49:00 +0000 (18:49 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 17 Mar 2011 17:49:00 +0000 (18:49 +0100)
commit31ac4a233ddcb341e49f63f964d4d35fd2097a9c
treeb1fa968dedda8ca161af9705db82284c8f794443
parenta95d7950564b4a3cf6b14685f28cb9544dfbcde6
parent005321304bec7f71e748db3173d411f5684642e2
Merge branch 'bug_453_multiepg_no_more_ask_bouquet' into experimental
data/setup.xml
lib/python/Components/UsageConfig.py
lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
lib/python/Screens/InfoBarGenerics.py