mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-30 17:01:15 +02:00
Conflicts: src/daemonc/remotecontrol.cpp src/gui/luainstance.cpp src/gui/movieplayer.cpp src/gui/videosettings.cpp src/neutrino.cpp src/system/setting_helpers.cpp src/zapit/src/zapit.cpp