vanhofen 07bc541c29 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp


Origin commit data
------------------
Commit: bf43ce3643
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-02 (Sat, 02 Dec 2017)
2017-12-02 20:19:08 +01:00
2017-12-01 14:26:33 +01:00
2017-11-16 19:43:25 +01:00
2017-11-03 17:46:01 +01: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%