Merge remote-tracking branch 'tuxbox/master'

* needs compile fixes
* needs additional tests, of course :-)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 13ab1ebc8a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-10-22 11:37:40 +02:00
346 changed files with 13372 additions and 6088 deletions

View File

@@ -87,7 +87,7 @@ static bool notify_complete = false;
static unsigned int epg_save_frequently;
static long secondsToCache;
static long secondsExtendedTextCache;
long int secondsExtendedTextCache = 0;
static long oldEventsAre;
static int scanning = 1;