vanhofen c88a958978 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	data/icons/hints/hint_backup.png
	data/icons/hints/hint_default.png
	data/icons/hints/hint_factory.png
	data/icons/hints/hint_language.png
	data/icons/hints/hint_load.png
	data/icons/hints/hint_reset.png
	data/icons/hints/hint_restore.png
	data/icons/hints/hint_saveas.png
	data/icons/hints/hint_ytplay.png
	data/icons/status/various/mute.png


Origin commit data
------------------
Commit: 188151d164
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-19 (Tue, 19 Dec 2017)
2017-12-19 20:42:53 +01:00
2017-11-03 17:46:01 +01: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%