scrawl cad18969e3 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ... Conflicts: apps/openmw/mwmechanics/aicombat.cpp apps/openmw/mwmechanics/aitravel.cpp		2015-06-14 16:32:13 +02:00
..
.gitignore
CMakeLists.txt
esmtool.cpp
labels.cpp	Fix using wrong bit flag for NPC stats auto-calculation. Also set the corresponding mNpdtType which is used when determining which data structure to save. Should resolve Bug #2668.	2015-06-13 14:37:47 +10:00
labels.hpp
record.cpp
record.hpp