Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue ... Conflicts: apps/openmw/mwdialogue/dialoguemanagerimp.hpp apps/openmw/mwmechanics/npcstats.cpp apps/openmw/mwmechanics/npcstats.hpp		2012-11-10 15:44:44 +01:00
..
esmtool	resolve Script::mData.mName -> mId, resolve moving ESMStore	2012-11-05 17:41:36 +04:00
launcher	Fixed problem with sorting of the masters in the launcher	2012-11-02 15:06:14 +01:00
mwiniimporter	disabling gcc extensions	2012-10-09 17:10:25 +02:00
openmw	Merge branch 'master' into dialogue	2012-11-10 15:44:44 +01:00
openmw_test_suite	Added fix for not visible pthreads functions for linker with glibc 2.15	2012-08-20 00:18:40 +03:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00