recycled-ni-neutrino

mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-29 08:21:07 +02:00

Go to file

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

Conflicts:
	src/gui/audioplayer.cpp
	src/system/localize.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: c5df56955b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-07-04 (Tue, 04 Jul 2017)



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

2017-07-04 14:06:36 +02:00