Merge branch 'master' into pu/fb-setmode

Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ca9d9c4f9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-19 (Sun, 19 Mar 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Michael Liebmann
2017-03-19 08:38:15 +01:00
8 changed files with 45 additions and 22 deletions

View File

@@ -934,9 +934,6 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
struct SglobalInfo
{
unsigned char box_Type;
delivery_system_t delivery_system;
bool has_fan;
hw_caps_t *hw_caps;
};