git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 699e95c 4e67809)
Merge branch 'bug_293_indicate_unhandled_key' into experimental
authorghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 16:35:27 +0000 (17:35 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 16:35:27 +0000 (17:35 +0100)
1  2 
data/skin_default.xml patch | diff1 | diff2 | blob | history
data/skin_default/Makefile.am patch | diff1 | diff2 | blob | history
lib/python/Screens/InfoBarGenerics.py patch | diff1 | diff2 | blob | history

diff --cc data/skin_default.xml
Simple merge
diff --cc data/skin_default/Makefile.am
index 15f4a54fab54285eacb4ad5c3b2c798c8d88ffc5,3106af97743249dfed3207dbb0542f3ff7cbbf76..9e9b7cd4e8c03787b29831a844b2b08819440c2f
mode 100755,100644..100755
--- 1/data/skin_default/Makefile.am
--- 2/data/skin_default/Makefile.am
+++ b/data/skin_default/Makefile.am
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