David Cernat 2390744b45 Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Player.hpp apps/openmw-mp/Script/Functions/Mechanics.cpp apps/openmw-mp/Script/Functions/Mechanics.hpp apps/openmw-mp/Script/Functions/Settings.hpp apps/openmw-mp/Script/Functions/Stats.cpp apps/openmw-mp/Script/Functions/Stats.hpp components/openmw-mp/Base/BasePlayer.hpp		2018-04-10 08:20:23 +03:00
..
browser	[Browser] Add compatibility compilation mode	2018-04-02 14:04:48 +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 #395 from OpenMW/master while resolving conflicts	2018-03-29 07:28:30 +03:00
openmw	Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts	2018-04-10 08:20:23 +03:00
openmw-mp	Merge pull request #404 from TES3MP/0.6.3 while resolving conflicts	2018-04-10 08:20:23 +03:00
openmw_test_suite	Label gtest directories as system	2018-03-13 21:27:14 +03:00
wizard	Auto-detect the actual Morrowind assets path (Fixes #4336)	2018-03-23 23:52:08 +03:00
doc.hpp