cc9cii fb2ba7610c Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields ... Conflicts: apps/opencs/CMakeLists.txt apps/opencs/model/doc/document.cpp apps/opencs/model/world/columnbase.hpp apps/opencs/model/world/columns.cpp apps/opencs/model/world/columns.hpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/idtable.cpp apps/opencs/view/world/dialoguesubview.cpp apps/opencs/view/world/dialoguesubview.hpp apps/opencs/view/world/util.cpp		2015-03-04 11:22:42 +11:00
..
bsatool	Several warning fixes	2015-01-23 15:34:47 +01:00
esmtool	removed redundant mScript field in ESM::StartScript	2015-03-03 13:04:57 +01:00
essimporter	ESSImport: read AiPackages	2015-02-14 12:25:52 +01:00
launcher	Merge remote-tracking branch 'dteviot/Bug2344'	2015-02-26 19:05:30 +01:00
mwiniimporter	fix: boost::filesystem::canonical() available from version 1.48.	2015-02-26 20:07:23 +13:00
opencs	Merge remote-tracking branch 'remotes/upstream/master' into NonTableFields	2015-03-04 11:22:42 +11:00
openmw	removed redundant mScript field in ESM::StartScript	2015-03-03 13:04:57 +01:00
openmw_test_suite	UnitTests: add another dialogue keyword test	2015-01-10 00:29:07 +01:00
wizard	Rename omwlauncher -> openmw-launcher, mwiniimport -> openmw-iniimporter	2015-01-31 22:40:38 +01:00
doc.hpp	first set of additional doxygen comments	2010-09-25 15:03:53 +02:00