mirror of
https://github.com/OpenMW/openmw.git
synced 2025-05-20 05:41:31 +00:00
Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout |
||
---|---|---|
.. | ||
layout.hpp | ||
manager.cpp | ||
manager.hpp |