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 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-09-13 08:36:25 +02:00
parent e6d2ba00b3 284440913a
commit 2097d7e876
25 changed files with 368 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/settings.h
View File

@@ -278,7 +278,6 @@ struct SNeutrinoSettings
int ci_mode; //NI
std::string ci_pincode;
int radiotext_enable;
int easymenu;
int webtv_xml_auto; //NI
//screen saver