vanhofen 8df8b37dc2 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0113efac9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-13 (Mon, 13 Nov 2017)



------------------
This commit was generated by Migit
2017-11-13 21:25:41 +01:00
2017-11-03 17:46:01 +01:00
2017-11-03 17:46:01 +01:00
2017-11-03 17:46:57 +01:00
2016-02-16 10:16:15 +03:00

Neutrino-HD ツ

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