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

Conflicts:
	configure.ac
	data/locale/english.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/plugins.h
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 20d546e42f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-18 (Wed, 18 Oct 2017)



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

2017-10-18 09:53:55 +02:00

..

daemonc

Merge branch 'master' into pu/mp

2017-09-26 12:52:04 +02:00

driver

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

2017-10-18 09:41:46 +02:00

eitd

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

2017-10-18 09:41:46 +02:00

gui

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-10-18 09:53:55 +02:00

lcddisplay

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

2017-10-18 09:41:46 +02:00

nhttpd

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

2017-10-18 09:41:46 +02:00

system

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

2017-10-18 09:41:46 +02:00

timerd

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

2017-10-18 09:41:46 +02:00

zapit

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

2017-10-18 09:41:46 +02:00

compatibility.h

…

create_rcsim_h.sh

…

drivertool.c

…

dt.c

…

global.h

define FLAGDIR in acinclude.m4 otherwise it won't work on PC

2017-09-12 22:30:34 +02:00

Makefile.am

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

2017-10-18 09:41:46 +02:00

mdev_helper.cpp

…

mymenu.h

…

neutrino_menue.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-10-18 09:53:55 +02:00

neutrino_menue.h

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

2017-10-18 09:41:46 +02:00

neutrino.cpp

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

2017-10-18 09:53:55 +02:00

neutrino.h

settings_manager_teams: small reworks; unify locales

2017-09-09 11:03:52 +02:00

neutrinoMessages.h

…

nosanitize.h

…

plugin.h

plugin-code: cleanup from many unused code; ...

2017-09-14 12:14:41 +02:00

rcsim.c

…

uncoolinit.cpp

…

uncooloff.c

…