Merge branch 'master' into pu/mp

This commit is contained in:
M. Liebmann
2017-09-21 09:07:15 +02:00
19 changed files with 236 additions and 100 deletions

View File

@@ -946,6 +946,7 @@ const time_settings_struct_t timing_setting[SNeutrinoSettings::TIMING_SETTING_CO
#define SCROLLBAR_WIDTH (OFFSET_INNER_MID + 2*OFFSET_INNER_MIN)
#define FRAME_WIDTH_MIN CFrameBuffer::getInstance()->scale2Res(2)
#define FRAME_WIDTH_NONE 0
#define DETAILSLINE_WIDTH CFrameBuffer::getInstance()->scale2Res(16)