mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-01 01:41:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-12 21:54:48 +01:00
parent a99fe21b74 ed047027d1
commit 4ac4e963ad
41 changed files with 206 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/settings.h
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
@@ -181,7 +181,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;