Merge branch 'cst-next.pre' into cst-next

This commit is contained in:
2015-04-30 09:20:43 +02:00
81 changed files with 909 additions and 477 deletions

View File

@@ -60,6 +60,8 @@ struct SNeutrinoTheme
unsigned char menu_Head_Text_green;
unsigned char menu_Head_Text_blue;
int menu_Head_gradient;
unsigned char menu_Content_alpha;
unsigned char menu_Content_red;
unsigned char menu_Content_green;
@@ -90,6 +92,8 @@ struct SNeutrinoTheme
unsigned char menu_Content_inactive_Text_green;
unsigned char menu_Content_inactive_Text_blue;
int menu_Hint_gradient;
unsigned char infobar_alpha;
unsigned char infobar_red;
unsigned char infobar_green;
@@ -366,7 +370,6 @@ struct SNeutrinoSettings
int colored_events_channellist;
int colored_events_infobar;
int contrast_fonts;
int gradiant;
//network
#define NETWORK_NFS_NR_OF_ENTRIES 8