Merge branch 'master' into pu/mp

This commit is contained in:
svenhoefer
2017-04-19 21:35:56 +02:00
26 changed files with 217 additions and 460 deletions

View File

@@ -922,7 +922,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define OFFSET_INNER_MIN 2
#define OFFSET_INNER_NONE 0
#define SCROLLBAR_WIDTH OFFSET_INNER_MID + 2*OFFSET_INNER_MIN
#define SCROLLBAR_WIDTH (OFFSET_INNER_MID + 2*OFFSET_INNER_MIN)
#define DETAILSLINE_WIDTH 16 // TODO: scale2Res() ?