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 
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-22 23:45:32 +01:00
parent f57041a98b 99b59f1641
commit 0b8c62cd41
15 changed files with 42 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/locals_intern.h
View File

@@ -2667,6 +2667,7 @@ const char * locale_real_names[] =
"timing.infobar_radio",
"timing.menu",
"timing.numericzap",
"timing.popup_messages",
"timing.volumebar",
"tmdb.api_key",
"tmdb.enabled",