Marc Zinnschlag 2c70a93553 Merge branch 'master' into potions ... Conflicts: apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp		2012-07-17 10:32:18 +02:00
..
dialoguemanager.cpp	Merge branch 'master' into potions	2012-07-17 10:32:18 +02:00
dialoguemanager.hpp	Prepending m to the name of every member variable.	2012-07-13 03:51:58 -07:00
journal.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
journal.hpp
journalentry.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
journalentry.hpp	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00
quest.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
quest.hpp	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.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	Issue #107: World is accessed only through the interface class from now on; some include cleanup	2012-07-03 12:30:50 +02:00