1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-11 00:39:59 +00:00
OpenMW/apps
Marc Zinnschlag 2cfe5f0697 Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
2010-08-18 09:25:07 +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-18 09:25:07 +02:00