vanhofen d79f920a6b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/timerlist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 94d3ba6d1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-21 (Wed, 21 Jun 2017)



------------------
This commit was generated by Migit
2017-06-21 11:43:58 +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%