vanhofen 87c7eeeb3c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	acinclude.m4
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 195c22fffa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-16 (Thu, 16 Mar 2017)



------------------
This commit was generated by Migit
2017-03-16 22:29:22 +01:00
2016-12-15 14:00:45 +01:00
2017-03-11 12:50:36 +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

Neutrino-HD ツ

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