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

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


Origin commit data
------------------
Commit: 73418490bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-02 (Mon, 02 Oct 2017)

2017-10-02 23:21:37 +02:00

..

daemonc

add LUA_CFLAGS everywhere widget/menue.h is used

2017-09-26 12:41:05 +02:00

driver

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

2017-10-02 23:21:37 +02:00

eitd

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

2017-09-26 16:01:46 +02:00

gui

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

2017-10-02 23:21:37 +02:00

lcddisplay

…

nhttpd

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

2017-10-02 23:21:37 +02:00

system

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

2017-10-02 23:21:37 +02:00

timerd

…

zapit

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

2017-10-02 23:21:37 +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

add LUA_CFLAGS everywhere widget/menue.h is used

2017-09-26 12:41:05 +02:00

mdev_helper.cpp

…

mymenu.h

…

neutrino_menue.cpp

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

2017-09-25 11:41:44 +02:00

neutrino_menue.h

Merge remote-tracking branch 'tuxbox/master'

2017-09-23 17:01:42 +02:00

neutrino.cpp

add comments to suppres -Wimplicit-fallthrough warnings

2017-09-26 12:41:05 +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

…