Marc Zinnschlag 8086933282 Merge branch 'master' into dialogue ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwclass/creature.cpp apps/openmw/mwclass/creature.hpp apps/openmw/mwclass/npc.cpp apps/openmw/mwclass/npc.hpp		2010-08-08 14:14:43 +02:00
..
esmtool	modified Npc and Creature class to let them store a copy of their own ID	2010-08-08 14:09:09 +02:00
openmw	Merge branch 'master' into dialogue	2010-08-08 14:14:43 +02:00