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 
Conflicts:
	configure.ac
	lib/sectionsdclient/Makefile.am
	lib/timerdclient/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 93fdd4aa79
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-17 (Thu, 17 Nov 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-11-17 09:52:47 +01:00
parent 23fedcd08a f4c831795c
commit b0f13d51ce
20 changed files with 261 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/system/settings.h
View File

@@ -470,10 +470,10 @@ struct SNeutrinoSettings
int recording_zap_on_announce;
int recording_slow_warning;
int recording_fill_warning; //NI
int recording_tevents; //NI
int recording_startstop_msg;
int shutdown_timer_record_type;
std::vector<timer_remotebox_item> timer_remotebox_ip;
int timer_followscreenings;
std::string recording_filename_template;
int recording_already_found_check;