gixxpunk ae8431ac3f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
Conflicts:
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: 5f256432c9
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-11-07 (Tue, 07 Nov 2017)
2017-11-07 20:16:30 +01:00
2017-11-03 17:46:01 +01:00
2017-11-03 17:46:01 +01:00
2017-11-03 17:46:57 +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
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%