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

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66cbc06b01
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-06 23:54:02 +01:00
9 changed files with 68 additions and 21 deletions

View File

@@ -643,6 +643,7 @@ struct SNeutrinoSettings
int screen_EndX_lcd_1;
int screen_EndY_lcd_1;
int osd_resolution;
int osd_resolution_force;
int screen_preset;
int screen_width;
int screen_height;