projects / vuplus_dvbapp / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f488e1d 7560beb)
Merge branch 'bug_236_recordpath' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 3 Nov 2009 18:40:57 +0000 (19:40 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 3 Nov 2009 18:40:57 +0000 (19:40 +0100)
1  2 
lib/python/Components/config.py patch | diff1 | diff2 | blob | history
lib/python/Screens/InfoBar.py patch | diff1 | diff2 | blob | history
lib/python/Screens/InfoBarGenerics.py patch | diff1 | diff2 | blob | history

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