mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-29 16:31:05 +02:00
Conflicts:
data/locale/deutsch.locale
src/gui/channellist.cpp
src/gui/osd_setup.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94e6cf9a25
Author: martii <m4rtii@gmx.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)
------------------
This commit was generated by Migit