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
..
doc	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-13 21:11:24 +02:00
filter	Silence -Wreorder warnings, and remove -Wno-reorder.	2015-05-21 22:46:44 -05:00
settings	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-03 03:18:29 +02:00
tools	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
world	Merge branch 'master' of https://github.com/OpenMW/openmw into osg	2015-06-14 16:32:13 +02:00