mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-21 12:46:49 +01:00
parent ccd9e67d78 f57041a98b
commit 6b0e887585
125 changed files with 3517 additions and 3169 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/sectionsdclient/sectionsdclient.cpp
View File

@@ -216,6 +216,7 @@ void CSectionsdClient::setConfig(const epg_config config)
msg->network_ntpenable = config.network_ntpenable;
msg->epg_extendedcache = config.epg_extendedcache;
msg->epg_save_frequently= config.epg_save_frequently;
msg->epg_read_frequently= config.epg_read_frequently;
// config.network_ntpserver:
strcpy(&pData[sizeof(sectionsd::commandSetConfig)], config.network_ntpserver.c_str());
// config.epg_dir: