mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-03-17 01:21:15 +00:00
Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp
Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwscript/docs/vmformat.txt apps/openmw/mwworld/worldimp.hpp