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


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



------------------
This commit was generated by Migit
2017-06-07 15:41:49 +02:00
2017-06-07 14:18:01 +02:00
2017-03-23 19:00:57 +01:00
2017-06-07 15:28:53 +02: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%