mirror of
https://github.com/OpenMW/openmw.git
synced 2025-10-24 16:26:36 +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 |
||
|---|---|---|
| .. | ||
| tests | ||
| bsa_archive.cpp | ||
| bsa_archive.hpp | ||
| bsa_file.cpp | ||
| bsa_file.hpp | ||