aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorFelix Domke <tmbinc@elitedvb.net>2009-02-12 16:49:17 +0100
committerFelix Domke <tmbinc@elitedvb.net>2009-02-12 16:49:17 +0100
commit89a55fb89dbfb1d78255b48a50a8b4d28e83cdef (patch)
treeaa3a6dd046bd540d8b4c622763721063d178cbce /data
parentbbfcb7ea1f040d030277e2b6f2efa9ea0967bf2b (diff)
parent1bd22cc97199c878255925ef2a9032881acef470 (diff)
downloadenigma2-89a55fb89dbfb1d78255b48a50a8b4d28e83cdef.tar.gz
enigma2-89a55fb89dbfb1d78255b48a50a8b4d28e83cdef.zip
Merge branch 'master' of /home/tmbinc/enigma2-git into tmbinc/FixTimingBugs
Diffstat (limited to 'data')
-rw-r--r--data/keymap.xml3
1 files changed, 0 insertions, 3 deletions
diff --git a/data/keymap.xml b/data/keymap.xml
index 0a0dc867..264afccf 100644
--- a/data/keymap.xml
+++ b/data/keymap.xml
@@ -398,9 +398,6 @@
<key id="KEY_PREVIOUS" mapto="jumpPreviousMark" flags="m" />
<key id="KEY_0" mapto="toggleMark" flags="m" />
<key id="KEY_NEXT" mapto="jumpNextMark" flags="m" />
- <key id="KEY_RED" mapto="jumpPreviousMark" flags="m" />
- <key id="KEY_YELLOW" mapto="toggleMark" flags="m" />
- <key id="KEY_BLUE" mapto="jumpNextMark" flags="m" />
</device>
<device name="dreambox ir keyboard">
<key id="KEY_PREVIOUSSONG" mapto="jumpPreviousMark" flags="m" />