aboutsummaryrefslogtreecommitdiff
path: root/data/menu.xml
diff options
context:
space:
mode:
authoracid-burn <acid-burn@opendreambox.org>2010-10-05 12:58:30 +0200
committeracid-burn <acid-burn@opendreambox.org>2010-10-05 12:58:30 +0200
commit5fc72d747469d805943e5310dcc6bc9e748300e6 (patch)
treed28b6cc41272456897bd73ddfd740c793300cac7 /data/menu.xml
parentb6da0afe0cd5cf7ba08427fd1b8e2fe9bb270901 (diff)
parent97f8d756b444ef1d308f2c6e80b62e5e5a057cc1 (diff)
downloadenigma2-5fc72d747469d805943e5310dcc6bc9e748300e6.tar.gz
enigma2-5fc72d747469d805943e5310dcc6bc9e748300e6.zip
Merge commit 'origin/bug_69_configurable_inputdevice_delay'
Diffstat (limited to 'data/menu.xml')
-rwxr-xr-xdata/menu.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/data/menu.xml b/data/menu.xml
index b437fbc7..6507bfe3 100755
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -62,8 +62,9 @@
</menu>
<!--<item text="Remote Control"><setup id="rc" /></item>-->
<!--<item text="OSD"><setup id="osd" /></item>-->
- <item requires="Display"><setup level="1" id="lcd" /></item>
<item level="0" text="Network" entryID="network_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection" /></item>
+ <item level="1" text="Input devices" entryID="input_device_setup"><screen module="InputDeviceSetup" screen="InputDeviceSelection" /></item>
+ <item requires="Display"><setup level="1" id="lcd" /></item>
<item text="Keyboard"><setup id="keyboard" /></item>
<!--<menu level="1" text="Network..." entryID="network_setup">
<id val="network" />