vanhofen 70d2c535ae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox ...

Conflicts:
	src/nhttpd/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eafc848f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-16 (Wed, 16 Nov 2016)



------------------
This commit was generated by Migit

2016-11-16 23:43:57 +01:00

..

Makefile.am

make sure the private dvb headers are used on coolstream

2016-11-16 20:30:14 +01:00

timerdclient.cpp

timerd: adjust recording timers to epg

2016-09-26 13:04:48 +02:00

timerdclient.h

timerd: adjust recording timers to epg

2016-09-26 13:04:48 +02:00

timerdmsg.h

…

timerdtypes.h

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

2016-10-29 11:41:02 +02:00