Michael Liebmann 4246a31ba6 Merge branch 'cst-next' into nmp-cst-next ...

- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)

2016-08-19 17:40:48 +02:00

..

Makefile.am

use the correct include path to the private headers

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

timerdclient.cpp

Merge branch 'cst-next' into nmp-cst-next

2016-08-19 17:40:48 +02:00

timerdclient.h

adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP

2016-03-03 11:18:15 +01:00

timerdmsg.h

…

timerdtypes.h

adzap: use adzap-thread in epg view; remove pseudo timertype ADZAP

2016-03-03 11:18:15 +01:00