git.cweiske.de / enigma2.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bf6508 2738bca)
Merge branch 'bug157_wizard_virtualkeyboard'
authoracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:42:27 +0000 (06:42 +0100)
committeracid-burn <acid-burn@opendreambox.org>
Wed, 23 Dec 2009 05:42:27 +0000 (06:42 +0100)
1  2 
data/skin_default.xml patch | diff1 | diff2 | blob | history

diff --cc data/skin_default.xml
Simple merge
Clone of git://git.opendreambox.org/git/enigma2.git before dream multimedia removed all the engima2 sources