Thilo Graf 4aa0dca60b Merge branch 'master' into pu/msgbox
Conflicts:
 	src/gui/followscreenings.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e8c700dd2
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-15 (Tue, 15 Nov 2016)

Origin message was:
------------------
Merge branch 'master' into pu/msgbox

Conflicts:
  	src/gui/followscreenings.cpp


------------------
This commit was generated by Migit
2016-11-15 19:49:27 +01:00
2016-11-15 19:49:27 +01:00
2016-11-15 19:49:27 +01:00
2016-01-14 22:29:00 +01: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%