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

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: fd5029560e
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 00:19:32 +02:00
22 changed files with 59 additions and 20 deletions

View File

@@ -94,6 +94,11 @@ struct SNeutrinoTheme
unsigned char menu_Content_inactive_Text_green;
unsigned char menu_Content_inactive_Text_blue;
unsigned char menu_Foot_alpha;
unsigned char menu_Foot_red;
unsigned char menu_Foot_green;
unsigned char menu_Foot_blue;
int menu_Hint_gradient;
int menu_Hint_gradient_direction;
int menu_ButtonBar_gradient;