Marc Zinnschlag 8c4303399f Merge branch 'master' into dialogue ... Conflicts: apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loadinfo.hpp		2013-11-10 13:21:39 +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	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
openmw	Merge branch 'master' into dialogue	2013-11-10 13:21:39 +01:00
openmw_test_suite	Added unittests for FileFinder::FileFinderStrict class.	2013-08-31 00:13:42 +02:00
doc.hpp