Merge commit 'dm/experimental' into test_0127
authorschon <schon@dev03-server>
Thu, 27 Jan 2011 01:15:34 +0000 (10:15 +0900)
committerschon <schon@dev03-server>
Thu, 27 Jan 2011 01:15:34 +0000 (10:15 +0900)
1  2 
data/keymap.xml
lib/dvb/dvb.cpp
lib/python/Screens/InfoBar.py
lib/service/servicedvb.cpp

diff --cc data/keymap.xml
Simple merge
diff --cc lib/dvb/dvb.cpp
index 68197c3,cd6c232..fbca6f3
mode 100755,100644..100755
Simple merge