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

Origin commit data
------------------
Branch: ni/coolstream
Commit: 111ac82c9a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-07-04 14:07:10 +02:00
13 changed files with 71 additions and 38 deletions

View File

@@ -307,6 +307,7 @@ struct SNeutrinoSettings
std::string epg_dir;
int epg_scan;
int epg_scan_mode;
int epg_scan_rescan;
int epg_save_mode;
int epg_search_history_size;