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

Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)



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

2017-06-21 11:43:58 +02:00

..

daemonc

…

driver

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

2017-06-18 23:00:29 +02:00

eitd

set threadnames to unique values

2017-06-07 14:17:12 +02:00

gui

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

2017-06-21 11:43:58 +02:00

lcddisplay

…

nhttpd

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

2017-06-16 11:10:05 +02:00

system

moviebrowser: clearify deletion-locale; add movie-title to menu

2017-06-21 10:31:22 +02:00

timerd

timermanager: don't set stoptime for timers without a stop-event

2017-06-21 10:31:22 +02:00

zapit

Merge branch 'pu/fb-setmode'

2017-06-07 14:18:01 +02:00

compatibility.h

…

create_rcsim_h.sh

…

drivertool.c

…

dt.c

…

global.h

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

2017-06-15 10:37:41 +02:00

Makefile.am

…

mdev_helper.cpp

…

mymenu.h

…

neutrino_menue.cpp

…

neutrino_menue.h

osd_setup: add channellogo-setup menu

2017-05-23 17:58:53 +02:00

neutrino.cpp

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

2017-06-15 10:37:41 +02:00

neutrino.h

…

neutrinoMessages.h

…

plugin.h

…

rcsim.c

…