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
journal.cpp
journal.hpp
journalentry.cpp
journalentry.hpp
quest.cpp
quest.hpp
topic.cpp
topic.hpp