recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-30 08:51:04 +02:00

Go to file

vanhofen a55e382f15 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	src/gui/components/cc_timer.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 641fb364fe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)



------------------
This commit was generated by Migit

2017-05-30 01:26:34 +02:00