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 /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next

Browse Source 
Conflicts:
	src/gui/Makefile.am
	src/neutrino.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d42384f0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-07-01 (Fri, 01 Jul 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-07-01 15:28:37 +02:00
parent 4c0c75fd67 8da554c0fa
commit 2f8caeb659
17 changed files with 338 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/locals.h
View File

@@ -448,6 +448,7 @@ typedef enum
LOCALE_EPGVIEWER_LENGTH,
LOCALE_EPGVIEWER_NODETAILED,
LOCALE_EPGVIEWER_NOTFOUND,
LOCALE_EPGVIEWER_SELECT_SCREENING,
LOCALE_EVENTFINDER_FSK,
LOCALE_EVENTFINDER_GENRE,
LOCALE_EVENTFINDER_HEAD,