vanhofen 8acef4abf4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/driver/scanepg.cpp
	src/gui/audioplayer.cpp
	src/gui/infoviewer.cpp
	src/gui/movieplayer.cpp
	src/neutrino.cpp
	src/neutrino.h
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 265771c9a2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-23 (Thu, 23 Nov 2017)



------------------
This commit was generated by Migit
2017-11-23 17:31:02 +01:00
2017-11-16 19:43:25 +01:00
2017-11-03 17:46:01 +01:00
2009-12-08 11:05:11 +00:00
2009-12-08 11:18:17 +00:00
2016-02-16 10:16:15 +03:00
2017-09-13 13:35:23 +02:00

Neutrino-HD ツ

Languages
C++ 85%
C 12.5%
Shell 0.6%
Makefile 0.6%
M4 0.5%
Other 0.7%