mirror of
https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git
synced 2025-08-31 09:21:09 +02:00
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/driver/simple_display.cpp
src/gui/hdd_menu.cpp
src/gui/infoviewer_bb.cpp
src/gui/infoviewer_bb.h
src/gui/moviebrowser.cpp
src/gui/record_setup.cpp
src/neutrino.cpp
src/system/ytcache.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c15db185f
Author: martii <m4rtii@gmx.de>
Date: 2013-11-27 (Wed, 27 Nov 2013)
------------------
This commit was generated by Migit