cc9cii 5eefcd862f Merge branch 'master' into NonTableFields ... Conflicts: apps/opencs/model/tools/tools.cpp apps/opencs/model/world/columnbase.cpp apps/opencs/model/world/commands.cpp apps/opencs/model/world/commands.hpp apps/opencs/model/world/idtable.hpp apps/opencs/model/world/refidadapter.cpp apps/opencs/model/world/refidadapter.hpp apps/opencs/view/world/dialoguesubview.hpp		2015-03-16 10:30:54 +11:00
..
bsatool	Several warning fixes	2015-01-23 15:34:47 +01:00
esmtool	Add travel service support for creatures (Fixes #2432)	2015-03-09 03:15:11 +01:00
essimporter	fixing MSVC 2013 warning C4244: & C4305	2015-03-08 13:07:29 +13:00
launcher	Merge remote-tracking branch 'dteviot/Bug2344'	2015-02-26 19:05:30 +01:00
mwiniimporter	fix -Wnewline-eof warnings	2015-03-11 10:54:45 -04:00
opencs	Merge branch 'master' into NonTableFields	2015-03-16 10:30:54 +11:00
openmw	Merge remote-tracking branch 'sandstranger/command-line-support-for-Android'	2015-03-15 22:52:34 +01:00
openmw_test_suite	UnitTests: add another dialogue keyword test	2015-01-10 00:29:07 +01:00
wizard	Installer work for Windows (Fixes #1621)	2015-03-15 08:08:55 +13:00
doc.hpp