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:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93d809116
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-21 11:30:48 +02:00
parent 6542629122 108cf42786
commit d35d014a76
16 changed files with 581 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/system/settings.h
View File

@@ -463,6 +463,7 @@ struct SNeutrinoSettings
int recording_fill_warning; //NI
int recording_startstop_msg;
int shutdown_timer_record_type;
std::list<std::string> timer_remotebox_ip;
std::string recording_filename_template;
int recording_already_found_check;