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

Conflicts:
	src/neutrino.cpp
	src/neutrino.h
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: cd5b946202
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-20 (Mon, 20 Mar 2017)



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

2017-03-20 00:07:18 +01:00

..

debug.h

make various dprintf macros safer for general usage

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

Makefile.am

make sure the private dvb headers are used on coolstream

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

timerd.cpp

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

2017-02-12 23:01:15 +01:00

timermanager.cpp

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

2017-02-12 23:01:15 +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