Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next

Origin commit data
------------------
Branch: ni/coolstream
Commit: 6bfde8a3f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-13 16:04:30 +02:00
6 changed files with 149 additions and 51 deletions

View File

@@ -946,9 +946,9 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
// offsets
#define OFFSET_SHADOW 6
#define OFFSET_INTER 6
//#define OFFSET_INNER_LARGE 20
//#define OFFSET_INNER_MID 10
//#define OFFSET_INNER_SMALL 5
#define OFFSET_INNER_LARGE 20
#define OFFSET_INNER_MID 10
#define OFFSET_INNER_SMALL 5
struct SglobalInfo