vanhofen c2e72b711c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/keychooser.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a529a43164
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-15 (Fri, 15 Sep 2017)



------------------
This commit was generated by Migit
2017-09-15 18:26:42 +02:00
2017-09-14 12:16:17 +02:00
2017-09-14 12:16:17 +02: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%