David Cernat 4846497078 Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Script/Functions/Positions.cpp apps/openmw-mp/Script/Functions/Positions.hpp apps/openmw-mp/Script/Functions/World.cpp apps/openmw-mp/Script/Functions/World.hpp apps/openmw-mp/Script/Script.hpp apps/openmw-mp/Script/ScriptFunctions.cpp components/openmw-mp/Base/BasePlayer.hpp		2018-05-02 23:15:39 +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	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
essimporter	ESS-Importer: Convert magic projectiles (Closes #2320)	2017-09-20 18:58:56 +02:00
launcher	Merge pull request #408 from OpenMW/master	2018-04-18 18:05:09 +03: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	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
opencs	Merge pull request #408 from OpenMW/master	2018-04-18 18:05:09 +03:00
openmw	Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts	2018-05-02 23:15:39 +03:00
openmw-mp	Merge pull request #415 from TES3MP/0.6.3 while resolving conflicts	2018-05-02 23:15:39 +03:00
openmw_test_suite	Label gtest directories as system	2018-03-13 21:27:14 +03:00
wizard	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
doc.hpp