mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-26 09:35:28 +00:00
fd5486864a
Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwmechanics/actors.cpp apps/openmw/mwmechanics/actors.hpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp