mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-13 16:33:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'check/next-cc'

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56a7262d5d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-05 (Sun, 05 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2014-01-05 18:31:31 +01:00
parent 0c0123da75 50abadda7d
commit 003773490b
28 changed files with 563 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/system/settings.h
View File

@@ -659,9 +659,8 @@ struct SNeutrinoSettings
ITEM_CLOCK = 19,
ITEM_GAMES = 20,
ITEM_SCRIPTS = 21,
#if 0
ITEM_MOVIEPLAYER_TS,
#endif
ITEM_YOUTUBE = 22,
ITEM_FILEPLAY = 23,
ITEM_MAX // MUST be always the last in the list
} USER_ITEM;
std::string usermenu_text[BUTTON_MAX];