Merge branch 'master' into pu/fb-modules

This commit is contained in:
M. Liebmann
2017-02-12 09:24:08 +01:00
32 changed files with 112 additions and 99 deletions

View File

@@ -42,7 +42,7 @@
#include <string>
#include <list>
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 16
#else
#define VIDEOMENU_VIDEOMODE_OPTION_COUNT 12
@@ -173,7 +173,7 @@ struct SNeutrinoSettings
int analog_mode1;
int analog_mode2;
int video_43mode;
#ifdef BOXMODEL_APOLLO
#ifdef BOXMODEL_CS_HD2
int brightness;
int contrast;
int saturation;