mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-20 19:21:13 +00:00
Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp