vanhofen 45f0ad7d7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
2017-03-15 23:39:43 +01:00
2016-12-15 14:00:45 +01:00
2017-03-06 23:11:30 +01:00

Neutrino-HD ツ

Languages
C++ 85%
C 12.5%
Shell 0.6%
Makefile 0.6%
M4 0.5%
Other 0.7%