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

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4f68a5502b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-10 (Fri, 10 Feb 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-10 00:44:57 +01:00
parent c80102a917 a99fe21b74
commit 826d527841
13 changed files with 259 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/system/settings.h
View File

@@ -640,8 +640,6 @@ struct SNeutrinoSettings
int screen_preset;
int screen_width;
int screen_height;
int screen_xres;
int screen_yres;
//Software-update
int softupdate_mode;
@@ -804,9 +802,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;