forked from teamnwah/openmw-tes3coop
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 |
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 |