vanhofen e3154ef43b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/Makefile.am
	data/icons/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b9b466bc1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-07 (Wed, 07 Dec 2016)



------------------
This commit was generated by Migit
2016-12-07 10:55:25 +01:00
2016-05-19 22:59:54 +02:00
2016-11-06 20:52:14 +01:00
2016-01-14 22:29:00 +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%