Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next

Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-08-15 19:08:28 +02:00
28 changed files with 51 additions and 45 deletions

View File

@@ -768,6 +768,7 @@ fontsize.infobar_info Info
fontsize.infobar_number Nummer
fontsize.infobar_small Klein
fontsize.menu Menütext
fontsize.menu_foot Fußleiste (in allen GUI-Elementen)
fontsize.menu_hint Menü-Hilfe
fontsize.menu_info Menüinfo
fontsize.menu_title Menütitel

View File

@@ -768,6 +768,7 @@ fontsize.infobar_info info
fontsize.infobar_number Number
fontsize.infobar_small Small
fontsize.menu Menu text
fontsize.menu_foot Footer (in all GUI elements)
fontsize.menu_hint Menu hints
fontsize.menu_info Menu Info
fontsize.menu_title Menu Title