Merge branch 'bug_713_fix_timerlist_sort' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Fri, 18 Mar 2011 00:05:20 +0000 (01:05 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Fri, 18 Mar 2011 00:05:20 +0000 (01:05 +0100)
1  2 
data/setup.xml
lib/python/Components/UsageConfig.py
lib/python/Screens/TimerEdit.py

diff --cc data/setup.xml
Simple merge
Simple merge
Simple merge