vanhofen 2c16a6e06d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/color.h


Origin commit data
------------------
Commit: aaa3757e2e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 17:07:50 +02:00
2017-03-23 19:00: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%