mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 00:41:17 +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