Stefan Seyfried 30eb1a1ced Merge remote-tracking branch 'check/cst-next' ...

Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)

2015-02-07 23:12:01 +01: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 'check/cst-next'

2015-02-07 23:12:01 +01:00

timerdclient.h

timerdclient.cpp add check if zapto or record timer double is

2015-02-03 17:27:00 +01:00

timerdmsg.h

our current experimental Neutrino branch

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

timerdtypes.h

add pseudo AdZap timertype

2014-02-07 18:05:06 +01:00