Merge branch 'master' into pu/mp

This commit is contained in:
Jacek Jendrzej
2017-07-05 21:43:36 +02:00
9 changed files with 55 additions and 20 deletions

View File

@@ -295,6 +295,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;