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 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-04 12:02:35 +02:00
parent 9a737d7526 875a08f014
commit 10fec22ab4
8 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/locals.h
View File

@@ -462,6 +462,7 @@ typedef enum
LOCALE_EVENTFINDER_SEARCHING,
LOCALE_EVENTFINDER_START_SEARCH,
LOCALE_EVENTLIST_ADDITIONAL,
LOCALE_EVENTLIST_EPGPLUS,
LOCALE_EVENTLIST_NAME,
LOCALE_EVENTLISTBAR_CHANNELSWITCH,
LOCALE_EVENTLISTBAR_EVENTSORT,
@@ -1172,6 +1173,7 @@ typedef enum
LOCALE_MENU_HINT_EPG_SCAN,
LOCALE_MENU_HINT_EPG_SCAN_MODE,
LOCALE_MENU_HINT_EVENTLIST_ADDITIONAL,
LOCALE_MENU_HINT_EVENTLIST_EPGPLUS,
LOCALE_MENU_HINT_EVENTLIST_FONTS,
LOCALE_MENU_HINT_EVENTLIST_SETUP,
LOCALE_MENU_HINT_EXTENDED,