vanhofen cebea3854a Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: ccb70fd1b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-13 (Fri, 13 Oct 2017)



------------------
This commit was generated by Migit
2017-10-13 14:13:22 +02:00
2017-09-14 12:16:17 +02: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%