projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dce8789 c46312d)
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 02:47:44 +0000 (03:47 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 02:47:44 +0000 (03:47 +0100)
Conflicts:

lib/python/Screens/InfoBarGenerics.py

1  2 
lib/python/Screens/InfoBarGenerics.py patch | diff1 | diff2 | blob | history

diff --cc lib/python/Screens/InfoBarGenerics.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.