Stefan Seyfried 3f75ef5f47 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

2016-10-22 11:37:40 +02:00

..

Makefile.am

use the correct include path to the private headers

2015-01-28 20:53:58 +01:00

timerdclient.cpp

Merge remote-tracking branch 'tuxbox/master'

2016-10-22 11:37:40 +02:00

timerdclient.h

timerd: adjust recording timers to epg

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

timerdmsg.h

…

timerdtypes.h

varius fixes

2016-10-21 10:47:37 +02:00