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

Conflicts:
	src/timerd/timermanager.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fac2d36cda
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-04 (Sun, 04 Dec 2016)



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

2016-12-04 21:14:27 +01:00

..

debug.h

make various dprintf macros safer for general usage

2016-01-05 15:06:18 +01:00

doku.html

our current experimental Neutrino branch

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

Makefile.am

make sure the private dvb headers are used on coolstream

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

timerd.cpp

timerd: adjust recording timers to epg

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

timermanager.cpp

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

2016-12-04 21:14:27 +01:00

timermanager.h

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

2016-11-16 20:17:27 +01:00