aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorghost <andreas.monzner@multimedia-labs.de>2009-05-07 08:17:59 +0200
committerghost <andreas.monzner@multimedia-labs.de>2009-05-07 08:17:59 +0200
commit01261afa97d904fa9b2564aedabe1363d87ff186 (patch)
tree988e90379c7e2198bd62a249b7cf18c099680358 /data
parent2485162921817162f75d6e4fa14c700f501512ab (diff)
parent8d3e9193ba0ddaa819db9c6a0447eca74a8328a3 (diff)
downloadenigma2-01261afa97d904fa9b2564aedabe1363d87ff186.tar.gz
enigma2-01261afa97d904fa9b2564aedabe1363d87ff186.zip
Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
Diffstat (limited to 'data')
-rwxr-xr-x[-rw-r--r--]data/menu.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/data/menu.xml b/data/menu.xml
index 86000531..c7fb8897 100644..100755
--- a/data/menu.xml
+++ b/data/menu.xml
@@ -61,10 +61,10 @@
<item level="0" text="Filesystem Check..." entryID="harddisk_check"><screen module="HarddiskSetup" screen="HarddiskFsckSelection"/></item>
</menu>
<!--<item text="Remote Control"><setup id="rc" /></item>-->
- <!--<item text="Keyboard"><setup id="keyboard" /></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 text="Keyboard"><setup id="keyboard" /></item>
<!--<menu level="1" text="Network..." entryID="network_setup">
<id val="network" />
<item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item>