mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-26 18:35:20 +00:00
5eefcd862f
Conflicts: apps/opencs/model/tools/tools.cpp apps/opencs/model/world/columnbase.cpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/commands.hpp apps/opencs/model/world/idtable.hpp apps/opencs/model/world/refidadapter.cpp apps/opencs/model/world/refidadapter.hpp apps/opencs/view/world/dialoguesubview.hpp