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

Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)

2016-10-21 11:23:51 +02:00

..

Makefile.am

Replacing obsolete 'INCLUDES' with 'AM_CPPFLAGS' in all Makefile.am

2013-10-17 04:22:49 +02:00

timerdclient.cpp

timerd: adjust recording timers to epg

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

timerdclient.h

timerd: adjust recording timers to epg

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

timerdmsg.h

our current experimental Neutrino branch

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

timerdtypes.h

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

2016-10-21 11:23:51 +02:00