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

Conflicts:
	src/gui/channellist.cpp
	src/gui/widget/menue.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d4677a319
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)



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

2017-09-21 10:32:33 +02:00

..

daemonc

…

driver

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

2017-09-14 16:23:15 +02:00

eitd

…

gui

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

2017-09-21 10:32:33 +02:00

lcddisplay

…

nhttpd

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

2017-09-18 16:31:55 +02:00

system

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

2017-09-21 10:32:33 +02:00

timerd

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

2017-06-26 22:51:16 +02:00

zapit

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

2017-09-14 16:23:15 +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

…

mdev_helper.cpp

…

mymenu.h

…

neutrino_menue.cpp

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

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

neutrino_menue.h

drop easymenu

2017-09-13 13:35:23 +02:00

neutrino.cpp

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

2017-09-18 16:31:55 +02:00

neutrino.h

settings_manager_teams: small reworks; unify locales

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

neutrinoMessages.h

…

plugin.h

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

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

rcsim.c

…