git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 99a717e e9272c4)
Merge branch 'master' into bug_245_record_playback_fixes
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 3 Dec 2009 16:56:03 +0000 (17:56 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 3 Dec 2009 16:56:03 +0000 (17:56 +0100)
1  2 
lib/python/Screens/InfoBarGenerics.py patch | diff1 | diff2 | blob | history

diff --cc lib/python/Screens/InfoBarGenerics.py
Simple merge
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources