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

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Commit: 5433054b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)

2017-06-18 00:52:04 +02:00

..

daemonc

…

driver

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

2017-06-15 10:37:41 +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-18 00:52:04 +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

settings.h: use CORNER_RADIUS_NONE defines ...

2017-06-15 01:01:55 +02:00

timerd

…

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

…