mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-10-04 02:21:11 -04:00

Conflicts: apps/openmw/mwclass/creature.cpp apps/openmw/mwclass/creature.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp apps/openmw/mwworld/class.cpp apps/openmw/mwworld/class.hpp