Marc Zinnschlag 7653caea27 Merge branch 'master' into collision ... Conflicts: apps/openmw/mwclass/npc.cpp		2011-03-22 20:02:03 +01:00
..
esmtool	Converted all tabs to four spaces	2011-01-05 22:18:21 +01:00
openmw	Merge branch 'master' into collision	2011-03-22 20:02:03 +01:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00