Merge remote-tracking branch 'tuxbox/master'

This commit is contained in:
Stefan Seyfried
2016-12-04 18:02:51 +01:00
135 changed files with 3933 additions and 3385 deletions

View File

@@ -172,6 +172,7 @@ class CSectionsdClient : private CBasicClient
int epg_extendedcache;
std::string network_ntpserver;
int epg_save_frequently;
int epg_read_frequently;
std::string epg_dir;
} epg_config;