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

Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

2017-03-01 13:09:50 +01:00

..

controlapi.cpp

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

2017-03-01 13:09:50 +01:00

controlapi.h

controlapi: add possibility to check for updates

2016-12-24 00:28:07 +01:00

Makefile.am

port HWLIB_CFLAGS from neutrino-mp to neutrino-hd

2016-01-14 22:29:00 +01:00

neutrinoapi.cpp

rename customcolor.h -> color_custom.h; reduce unneeded inludes

2016-10-10 14:19:55 +02:00

neutrinoapi.h

remove unnecessary sectionsdclient.h includes

2017-02-12 22:48:35 +01:00

neutrinoyparser.cpp

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

2017-03-01 13:09:50 +01:00

neutrinoyparser.h

NI \o/

2016-05-19 22:59:54 +02:00