mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-31 06:32:39 +00:00
740c8bc6f1
Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/view/world/dialoguesubview.cpp