mirror of
https://gitlab.com/OpenMW/openmw.git
synced 2025-01-25 15:35:23 +00:00
bc92b7b1fa
Conflicts: components/files/multidircollection.hpp components/nifogre/ogre_nif_loader.hpp