1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 08:49:55 +00:00
openmw-tes3mp/apps/openmw/mwdialogue
scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
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
2012-11-08 23:16:40 +01:00
..
dialoguemanagerimp.cpp Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement 2012-11-08 23:16:40 +01:00
dialoguemanagerimp.hpp Issue #107: MechanicsManager is accessed only through the interface class from now on 2012-08-11 17:30:55 +02:00
journalentry.cpp new interface in manualref, fix various typos 2012-11-06 13:43:48 +04:00
journalentry.hpp move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
journalimp.cpp move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
journalimp.hpp fixes some include guards 2012-08-11 12:02:51 +02:00
quest.cpp applying new interface vol.3, inconsistent 2012-11-05 21:45:35 +04:00
quest.hpp fixes some include guards 2012-08-11 12:02:51 +02:00
topic.cpp move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
topic.hpp fixes some include guards 2012-08-11 12:02:51 +02:00