Merge remote-tracking branch 'uncool/cst-next'

This commit is contained in:
Stefan Seyfried
2016-01-01 14:10:48 +01:00
36 changed files with 249 additions and 144 deletions

View File

@@ -173,6 +173,7 @@ struct SNeutrinoSettings
int infobar_sat_display;
int infobar_show_channeldesc;
int infobar_subchan_disp_pos;
int infobar_buttons_usertitle;
int fan_speed;
int infobar_show;
int infobar_show_channellogo;