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

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

Browse Source 
Conflicts:
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-09 20:22:37 +01:00
parent 695c7d3df9 5f774f310f
commit ab0fdc2825
12 changed files with 255 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/settings.h
View File

@@ -636,8 +636,6 @@ struct SNeutrinoSettings
int screen_preset;
int screen_width;
int screen_height;
int screen_xres;
int screen_yres;
//Software-update
int softupdate_mode;
@@ -800,9 +798,13 @@ struct SNeutrinoSettings
int zap_cycle;
int sms_channel;
int sms_movie;
std::string font_file;
std::string ttx_font_file;
int font_scaling_x;
int font_scaling_y;
//NI
int lcd4l_support;
std::string lcd4l_logodir;