mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
Conflicts: data/locale/english.locale src/driver/framebuffer.cpp src/gui/channellist.cpp src/gui/eventlist.cpp src/gui/moviebrowser.cpp