vanhofen d35d014a76 Merge branch 'ni/tuxbox' into ni/mp/tuxbox ...

Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b93d809116
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



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

2016-10-21 11:30:48 +02:00

..

Makefile.am

…

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

…

timerdtypes.h

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

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