vanhofen 1eae0a97f3 Merge branch 'ni/cst-next' into ni/mp/cst-next ...

Conflicts:
	src/gui/components/cc_frm_footer.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe20c9743f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-09-20 (Tue, 20 Sep 2016)



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

2016-09-20 08:22:22 +02:00

..

Makefile.am

use the correct include path to the private headers

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

timerdclient.cpp

Merge branch 'ni/cst-next' into ni/mp/cst-next

2016-09-20 08:22:22 +02:00

timerdclient.h

[experimental] timerd: adjust recording timers to epg

2016-09-15 00:48:06 +02:00

timerdmsg.h

our current experimental Neutrino branch

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

timerdtypes.h

[experimental] timerd: adjust recording timers to epg

2016-09-15 00:48:06 +02:00