mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-30 17:01:08 +02:00
Conflicts:
src/gui/moviebrowser.cpp
src/system/nkparser.cpp
src/system/nkparser.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd1ba8df97
Author: martii <m4rtii@gmx.de>
Date: 2013-11-17 (Sun, 17 Nov 2013)
------------------
This commit was generated by Migit