mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-05 15:40:10 +00:00
f989bfcd42
Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/view/doc/view.cpp apps/opencs/view/world/table.cpp apps/opencs/view/world/table.hpp