Marc Zinnschlag c995533e07 Merge branch 'dialogue' into saving ... Conflicts: apps/opencs/model/world/columnimp.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/data.cpp components/esm/loaddial.hpp		2013-10-21 16:45:43 +02:00
..
bsatool	Bsatool: extract and extractall modes	2013-03-07 21:21:00 +01:00
esmtool	Renamed esxSelector to contentSelector	2013-09-21 23:06:29 -05:00
launcher	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
mwiniimporter	Issue #913: Merge --master and --plugin switches	2013-09-29 09:11:57 +02:00
opencs	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
openmw	Merge branch 'dialogue' into saving	2013-10-21 16:45:43 +02:00
openmw_test_suite	Added unittests for FileFinder::FileFinderStrict class.	2013-08-31 00:13:42 +02:00
doc.hpp