David Cernat 7ec08e125b Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Script/Functions/Settings.cpp apps/openmw-mp/Script/Functions/Settings.hpp		2018-03-10 20:03:03 +02:00
..
browser	[General] Use correct versions of C++ per target	2018-02-16 16:31:45 +08:00
bsatool	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
esmtool	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
essimporter	ESS-Importer: Convert magic projectiles (Closes #2320)	2017-09-20 18:58:56 +02:00
launcher	Merge pull request #392 from OpenMW/master while resolving conflicts	2018-03-09 21:07:46 +02:00
master	[General] Use correct versions of C++ per target	2018-02-16 16:31:45 +08:00
mwiniimporter	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
niftest	Restore trailing new lines to shrink PR	2017-09-08 22:20:04 +01:00
opencs	Merge pull request #361 from OpenMW/master while resolving conflicts	2017-12-25 07:37:54 +02:00
openmw	Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts	2018-03-10 20:03:03 +02:00
openmw-mp	Merge pull request #394 from TES3MP/0.6.3 while resolving conflicts	2018-03-10 20:03:03 +02:00
openmw_test_suite	Move new behaviour into macro to reduce code duplication	2017-09-08 22:17:42 +01:00
wizard	Change default installation directory from 'data' to 'basedata' (Bug #3557)	2018-01-14 00:24:30 +00:00
doc.hpp