Merge branch 'bug_274_disable_fast_winding_for_non_ts' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 16:35:16 +0000 (17:35 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 16:35:16 +0000 (17:35 +0100)
1  2 
lib/python/Screens/InfoBarGenerics.py
lib/service/servicedvb.cpp

Simple merge
Simple merge