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

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-21 00:14:20 +01:00
parent d90f7b4228 566b0f9f34
commit 4af96e1b6d
22 changed files with 160 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -1177,6 +1177,7 @@ typedef enum
LOCALE_MENU_HINT_EPG_MAX_EVENTS,
LOCALE_MENU_HINT_EPG_OLD_EVENTS,
LOCALE_MENU_HINT_EPG_READ,
LOCALE_MENU_HINT_EPG_READ_FREQUENTLY,
LOCALE_MENU_HINT_EPG_SAVE,
LOCALE_MENU_HINT_EPG_SAVE_FREQUENTLY,
LOCALE_MENU_HINT_EPG_SAVE_MODE,
@@ -1701,6 +1702,7 @@ typedef enum
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT1,
LOCALE_MISCSETTINGS_EPG_OLD_EVENTS_HINT2,
LOCALE_MISCSETTINGS_EPG_READ,
LOCALE_MISCSETTINGS_EPG_READ_FREQUENTLY,
LOCALE_MISCSETTINGS_EPG_SAVE,
LOCALE_MISCSETTINGS_EPG_SAVE_FREQUENTLY,
LOCALE_MISCSETTINGS_EPG_SAVE_MODE,