Michael Liebmann 6192e893ab Fix merge conflicts ...

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

2016-08-20 09:01:33 +02:00

..

Makefile.am

use the correct include path to the private headers

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

timerdclient.cpp

Fix merge conflicts

2016-08-20 09:01:33 +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

our current experimental Neutrino branch

2009-12-08 11:05:11 +00:00

timerdtypes.h

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

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