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/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-12-30 21:54:46 +01:00
parent 600dfdfc28 0cc71f1a36
commit ab1e072620
17 changed files with 105 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/locals_intern.h
View File

@@ -780,6 +780,7 @@ const char * locale_real_names[] =
"fontmenu.scaling_y",
"fontmenu.scaling_y_hint2",
"fontmenu.sizes",
"fontsize.button_text",
"fontsize.channel_num_zap",
"fontsize.channellist",
"fontsize.channellist_descr",