mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-09-02 02:11:04 +02:00
Conflicts:
src/gui/dboxinfo.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 742760dbd3
Author: martii <m4rtii@gmx.de>
Date: 2014-05-24 (Sat, 24 May 2014)
------------------
This commit was generated by Migit