mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 10:21:04 +02:00
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This commit is contained in:
@@ -1615,6 +1615,7 @@ typedef enum
|
||||
LOCALE_MENU_HINT_SW_UPDATE,
|
||||
LOCALE_MENU_HINT_THEME,
|
||||
LOCALE_MENU_HINT_TIMEOUTS,
|
||||
LOCALE_MENU_HINT_TIMER_FOLLOWSCREENINGS,
|
||||
LOCALE_MENU_HINT_TIMERS,
|
||||
LOCALE_MENU_HINT_TIMEZONE,
|
||||
LOCALE_MENU_HINT_TMDB_API_KEY,
|
||||
@@ -2642,6 +2643,7 @@ typedef enum
|
||||
LOCALE_TIMERLIST_WEEKDAYS,
|
||||
LOCALE_TIMERLIST_WEEKDAYS_HINT_1,
|
||||
LOCALE_TIMERLIST_WEEKDAYS_HINT_2,
|
||||
LOCALE_TIMERSETTINGS_FOLLOWSCREENINGS,
|
||||
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER,
|
||||
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_1,
|
||||
LOCALE_TIMERSETTINGS_RECORD_SAFETY_TIME_AFTER_HINT_2,
|
||||
|
Reference in New Issue
Block a user