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

Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 43ef78ee44
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-02 13:10:10 +01:00
19 changed files with 115 additions and 79 deletions

View File

@@ -2444,6 +2444,7 @@ void CChannelList::paint_events(CChannelEventList &evtlist)
evt.description = g_Locale->getText(LOCALE_EPGLIST_NOEVENTS);
evt.eventID = 0;
evt.startTime = 0;
evt.duration = 0;
evtlist.push_back(evt);
}