git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'acid-burn/networking_changes'
[enigma2.git]
/
data
/
menu.xml
diff --git
a/data/menu.xml
b/data/menu.xml
index 0d8747189bdd3df05e448ce3a470da41ecb66ef3..6e103542bdc62ee362912d86909001d09d6f4e24 100755
(executable)
--- a/
data/menu.xml
+++ b/
data/menu.xml
@@
-61,8
+61,9
@@
</menu>
<!--<item text="Remote Control"><setup id="rc" /></item>-->
<!--<item text="OSD"><setup id="osd" /></item>-->
</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="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" />
<item text="Keyboard"><setup id="keyboard" /></item>
<!--<menu level="1" text="Network..." entryID="network_setup">
<id val="network" />