mirror of
https://github.com/TES3MP/openmw-tes3mp.git
synced 2025-11-25 16:04:38 +00:00
Conflicts: apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwdialogue/dialoguemanagerimp.cpp apps/openmw/mwgui/spellbuyingwindow.cpp apps/openmw/mwgui/trainingwindow.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp |
||
|---|---|---|
| .. | ||
| dialoguemanagerimp.cpp | ||
| dialoguemanagerimp.hpp | ||
| journalentry.cpp | ||
| journalentry.hpp | ||
| journalimp.cpp | ||
| journalimp.hpp | ||
| quest.cpp | ||
| quest.hpp | ||
| topic.cpp | ||
| topic.hpp | ||