vanhofen 6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



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

2016-11-02 09:50:10 +01:00

..

Makefile.am

use the correct include path to the private headers

2015-01-28 20:53:58 +01: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-29 11:41:02 +02:00