mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-02-13 12:40:04 +00:00
Conflicts: apps/openmw/mwrender/animation.cpp apps/openmw/mwrender/animation.hpp apps/openmw/mwrender/creatureanimation.cpp apps/openmw/mwrender/npcanimation.cpp apps/openmw/mwrender/npcanimation.hpp components/nifogre/ogre_nif_loader.hpp