mirror of
https://github.com/OpenMW/openmw.git
synced 2025-12-07 08:34:32 +00:00
Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout |
||
|---|---|---|
| .. | ||
| tests | ||
| ogre_nif_loader.cpp | ||
| ogre_nif_loader.hpp | ||