scrawl c64eb96952 Merge branch 'Travel_Dialogue' into training_travel ...

Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/dialogue.cpp
	apps/openmw/mwrender/globalmap.cpp
	files/mygui/CMakeLists.txt

2012-10-17 18:17:53 +02:00

..

dialoguemanagerimp.cpp

Merge branch 'Travel_Dialogue' into training_travel

2012-10-17 18:17:53 +02: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

rm record inheritance, rework esmtool accordingly

2012-09-30 23:34:53 +04:00

journalentry.hpp

fixes some include guards

2012-08-11 12:02:51 +02:00

journalimp.cpp

Task #400 Review GMST access

2012-09-22 21:35:57 +02:00

journalimp.hpp

fixes some include guards

2012-08-11 12:02:51 +02:00

quest.cpp

rm record inheritance, rework esmtool accordingly

2012-09-30 23:34:53 +04:00

quest.hpp

fixes some include guards

2012-08-11 12:02:51 +02:00

topic.cpp

Issue #107: World is accessed only through the interface class from now on; some include cleanup

2012-07-03 12:30:50 +02:00

topic.hpp

fixes some include guards

2012-08-11 12:02:51 +02:00