mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-29 16:31:11 +02:00
Conflicts: data/locale/english.locale src/gui/channellist.cpp src/gui/parentallock_setup.cpp src/neutrino.cpp
Conflicts: data/locale/english.locale src/gui/channellist.cpp src/gui/parentallock_setup.cpp src/neutrino.cpp