diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-17 10:04:02 +0100 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2008-11-17 10:04:02 +0100 |
| commit | 37b38cb05fc6bc4993f852a78bdba93c7627cf5b (patch) | |
| tree | 67b0f7159bea05a067626d719ac67d81979d547b /data | |
| parent | 083c49ace50d1aa702cf47785e0d38966f8e71a1 (diff) | |
| parent | 153e0ed5048c79c600e1acd085b62015b7314ba7 (diff) | |
| download | enigma2-37b38cb05fc6bc4993f852a78bdba93c7627cf5b.tar.gz enigma2-37b38cb05fc6bc4993f852a78bdba93c7627cf5b.zip | |
Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2
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> |
