Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 23:12:59 +0000 (00:12 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 24 Nov 2010 23:12:59 +0000 (00:12 +0100)
commitcdfd7a570b5b0813c8f62fc76deed949d7a11803
tree1b4e1f1ada84e532fe7c37ea9aea49a4c9d32fa0
parentac065de0aa482d630e41ba80ccdc5ef617e7e378
parent16902de6f4215ccd425622b92e8ae6be1ae4a97f
Merge branch 'bug_570_playback_skip_fixes_and_cleanup_ml_aholst' into experimental
data/setup.xml
lib/dvb/tstools.cpp
lib/python/Components/UsageConfig.py
lib/python/Plugins/Extensions/DVDPlayer/plugin.py
lib/python/Screens/InfoBarGenerics.py