diff options
| author | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-04-09 08:25:08 +0200 |
|---|---|---|
| committer | Fraxinas <andreas.frisch@multimedia-labs.de> | 2010-04-09 08:25:08 +0200 |
| commit | 98c7a787df63a93f868548c2b1e357c0d873ebbe (patch) | |
| tree | e8258f3e175e540e6106e0b7202abcf550b825d1 /data/setup.xml | |
| parent | ae60e9e3642949a91b7ea4f77374495fec9a51ed (diff) | |
| parent | 76250cdc36d0f0e84505d5654066229b846f035f (diff) | |
| download | enigma2-98c7a787df63a93f868548c2b1e357c0d873ebbe.tar.gz enigma2-98c7a787df63a93f868548c2b1e357c0d873ebbe.zip | |
Merge branch 'experimental' of git.opendreambox.org:/git/enigma2 into experimental
Diffstat (limited to 'data/setup.xml')
| -rw-r--r-- | data/setup.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/data/setup.xml b/data/setup.xml index 9425afda..705eaf33 100644 --- a/data/setup.xml +++ b/data/setup.xml @@ -31,8 +31,10 @@ <item level="1" text="Change bouquets in quickzap">config.usage.quickzap_bouquet_change</item> <item level="1" text="Alternative radio mode">config.usage.e1like_radio_mode</item> <item level="1" text="Action on long powerbutton press">config.usage.on_long_powerpress</item> + <item level="1" text="Action on short powerbutton press">config.usage.on_short_powerpress</item> <item level="0" text="Infobar timeout">config.usage.infobar_timeout</item> <item level="1" text="12V output" requires="12V_Output">config.usage.output_12V</item> + <item level="0" text="Show event-progress in channel selection">config.usage.show_event_progress_in_servicelist</item> <item level="2" text="Show infobar on channel change">config.usage.show_infobar_on_zap</item> <item level="2" text="Show infobar on skip forward/backward">config.usage.show_infobar_on_skip</item> <item level="2" text="Show infobar on event change">config.usage.show_infobar_on_event_change</item> |