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:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: dd6244f33e
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 13:19:03 +01:00
parent 2f63d963eb 695c7d3df9
commit c80102a917
132 changed files with 4170 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/neutrino.cpp
View File

@@ -1031,7 +1031,7 @@ int CNeutrinoApp::loadSetup(const char * fname)
g_settings.infoClockSeconds = configfile.getInt32("infoClockSeconds", 0); //NI
g_settings.livestreamResolution = configfile.getInt32("livestreamResolution", 1920);
g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", PLUGINDIR_VAR "/webtv");
g_settings.livestreamScriptPath = configfile.getString("livestreamScriptPath", WEBTVDIR_VAR);
g_settings.version_pseudo = configfile.getString("version_pseudo", "19700101000000");