diff options
| author | ghost <andreas.monzner@multimedia-labs.de> | 2008-11-17 19:23:02 +0100 |
|---|---|---|
| committer | ghost <andreas.monzner@multimedia-labs.de> | 2008-11-17 19:23:02 +0100 |
| commit | 5eb41508927a7f48d09d52e158e136fa07252dac (patch) | |
| tree | f5ce5ebbc380e903eda85d37b0a5ff503f4fea3d /data | |
| parent | 94913d0f73c36623ae19916d79cee759b7f6bc98 (diff) | |
| parent | 8cf7cff9fc9cde4d7add449478b8b35103325295 (diff) | |
| download | enigma2-5eb41508927a7f48d09d52e158e136fa07252dac.tar.gz enigma2-5eb41508927a7f48d09d52e158e136fa07252dac.zip | |
Merge branch 'master' into async_picload
Diffstat (limited to 'data')
| -rw-r--r-- | data/countries/ua.png | bin | 0 -> 1257 bytes | |||
| -rw-r--r-- | data/menu.xml | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/data/countries/ua.png b/data/countries/ua.png Binary files differnew file mode 100644 index 00000000..fa8751ee --- /dev/null +++ b/data/countries/ua.png diff --git a/data/menu.xml b/data/menu.xml index 93455b23..369b20e0 100644 --- a/data/menu.xml +++ b/data/menu.xml @@ -70,6 +70,7 @@ <item level="1" text="Device Setup..." entryID="device_setup"><screen module="NetworkSetup" screen="NetworkAdapterSelection"/></item> <item level="1" text="Nameserver Setup..." entryID="dns_setup"><screen module="NetworkSetup" screen="NameserverSetup"/></item> </menu>--> + <item level="2" text="Timeshift path..." entryId="timeshift_path"><screen module="LocationBox" screen="TimeshiftLocationBox" /></item> </menu> <item level="1" text="Common Interface" entryID="ci_setup" requires="CommonInterface"><screen module="Ci" screen="CiSelection" /></item> <item level="0" text="Parental control" entryID="parental_setup"><screen module="ParentalControlSetup" screen="ParentalControlSetup" /></item> |
