mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-01 01:41:12 +02:00
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:
@@ -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;
|
||||
|
Reference in New Issue
Block a user