mirror of
https://github.com/OpenMW/openmw.git
synced 2025-01-22 21:53:52 +00:00
0f6fd80294
Conflicts: apps/openmw/mwgui/windowmanagerimp.cpp apps/openmw/mwrender/npcanimation.cpp files/mygui/openmw_settings_window.layout |
||
---|---|---|
.. | ||
layout.hpp | ||
manager.cpp | ||
manager.hpp |