Marc Zinnschlag 11e254aac8 Merge remote-tracking branch 'gus/AICombat' ... Conflicts: apps/openmw/CMakeLists.txt apps/openmw/mwbase/mechanicsmanager.hpp apps/openmw/mwmechanics/mechanicsmanagerimp.cpp apps/openmw/mwmechanics/mechanicsmanagerimp.hpp		2013-11-19 09:10:48 +01:00
..
bsatool	Bsatool: extract and extractall modes	2013-03-07 21:21:00 +01:00
esmtool	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
launcher	Merge branch 'openmw-27'	2013-11-06 10:21:25 +01:00
mwiniimporter	Issue #913: Merge --master and --plugin switches	2013-09-29 09:11:57 +02:00
opencs	fix context menu	2013-11-16 23:08:03 +01:00
openmw	Merge remote-tracking branch 'gus/AICombat'	2013-11-19 09:10:48 +01:00
openmw_test_suite	Added unittests for FileFinder::FileFinderStrict class.	2013-08-31 00:13:42 +02:00
doc.hpp