Merge branch 'bug_293_indicate_unhandled_key' into experimental

author ghost <andreas.monzner@multimedia-labs.de>

Wed, 30 Dec 2009 16:35:27 +0000 (17:35 +0100)

committer ghost <andreas.monzner@multimedia-labs.de>

Wed, 30 Dec 2009 16:35:27 +0000 (17:35 +0100)
author ghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 16:35:27 +0000 (17:35 +0100)
committer ghost <andreas.monzner@multimedia-labs.de>
Wed, 30 Dec 2009 16:35:27 +0000 (17:35 +0100)
diff --cc data/skin_default.xml
Simple merge
diff --cc data/skin_default/Makefile.am

index 15f4a54,3106af9..9e9b7cd

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
author	ghost <andreas.monzner@multimedia-labs.de>
	Wed, 30 Dec 2009 16:35:27 +0000 (17:35 +0100)
committer	ghost <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