mirror of
https://github.com/tuxbox-neutrino/neutrino.git
synced 2025-08-26 15:02:56 +02:00
Conflicts: data/locale/deutsch.locale src/driver/Makefile.am src/neutrino.cpp src/system/locals.h src/system/locals_intern.h
Conflicts: data/locale/deutsch.locale src/driver/Makefile.am src/neutrino.cpp src/system/locals.h src/system/locals_intern.h