vanhofen 6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
2016-11-02 09:50:10 +01:00
2016-01-14 22:29:00 +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%