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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
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;