vanhofen 9eb559aa8f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)
2016-12-30 21:54:46 +01:00
2016-12-15 14:00:45 +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-12-19 17:55:15 +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%