mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-01-29 22:45:34 +00:00
4f5c4bf89a
Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/dialogue.cpp apps/openmw/mwgui/dialogue.hpp apps/openmw/mwgui/mode.hpp apps/openmw/mwgui/windowmanagerimp.cpp |
||
---|---|---|
.. | ||
dialoguemanagerimp.cpp | ||
dialoguemanagerimp.hpp | ||
journalentry.cpp | ||
journalentry.hpp | ||
journalimp.cpp | ||
journalimp.hpp | ||
quest.cpp | ||
quest.hpp | ||
topic.cpp | ||
topic.hpp |