mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 02:11:04 +02:00
Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
src/gui/moviebrowser.cpp
Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
This commit is contained in:
@@ -795,6 +795,7 @@ const char * locale_real_names[] =
|
||||
"fontsize.infobar_number",
|
||||
"fontsize.infobar_small",
|
||||
"fontsize.menu",
|
||||
"fontsize.menu_foot",
|
||||
"fontsize.menu_hint",
|
||||
"fontsize.menu_info",
|
||||
"fontsize.menu_title",
|
||||
|
Reference in New Issue
Block a user