cc9cii f989bfcd42 Merge branch 'master' into cc9cii ... Conflicts: apps/opencs/model/settings/usersettings.cpp apps/opencs/view/doc/view.cpp apps/opencs/view/world/table.cpp apps/opencs/view/world/table.hpp		2015-06-09 19:42:37 +10: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	Remove user preference setting option.	2015-06-07 13:29:45 +10:00
mwiniimporter	Add flag for mingw-w64 unicode support	2015-04-29 18:31:30 +02:00
opencs	Merge branch 'master' into cc9cii	2015-06-09 19:42:37 +10:00
openmw	Correct the explanation for the Console::acceptCommand()	2015-06-05 22:57:35 +03:00
openmw_test_suite	UnitTests: add another dialogue keyword test	2015-01-10 00:29:07 +01:00
wizard	Silence -Wreorder warnings.	2015-04-28 18:48:02 -05:00
doc.hpp