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

Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



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

2017-02-12 21:54:48 +01:00

..

controlapi.cpp

controlapi: add possibility to check for updates

2016-12-24 00:28:07 +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

tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile()

2016-08-26 16:05:45 +02:00

neutrinoyparser.cpp

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

2017-02-12 21:54:48 +01:00

neutrinoyparser.h

NI \o/

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