Files
recycled-ni-neutrino/data
vanhofen 260127f781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
2017-03-01 13:09:50 +01:00
..
2016-05-19 22:59:54 +02:00
2015-01-02 18:58:46 +01:00
2016-05-19 22:59:54 +02:00
2012-08-08 17:10:12 +02:00
2016-05-19 22:59:54 +02:00
2016-05-19 22:59:54 +02:00
2013-08-08 15:51:47 +02:00
2016-05-19 22:59:54 +02:00
2016-05-10 14:00:37 +02:00
2012-04-24 12:18:36 +02:00
2016-05-19 22:59:54 +02:00
2014-02-28 13:44:22 +04:00
2016-05-19 22:59:54 +02:00
2016-05-19 22:59:54 +02:00