vanhofen c7c36aceb1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/components/cc_frm_scrollbar.cpp
	src/gui/eventlist.cpp
	src/gui/widget/progresswindow.cpp


Origin commit data
------------------
Commit: 9b97705a3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-20 (Tue, 20 Jun 2017)
2017-06-20 14:24:59 +02:00
2017-03-23 19:00:57 +01:00
2017-06-07 15:28:53 +02:00

Neutrino-HD ツ

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