Files
recycled-ni-neutrino/data/y-web
vanhofen 9bd8b2b10c 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
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 13:09:50 +01:00
..
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-23 14:12:46 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00
2016-12-15 14:00:45 +01:00