David Cernat 176aa62b15 Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: apps/openmw-mp/Script/Functions/Cells.cpp apps/openmw-mp/Script/Functions/Cells.hpp apps/openmw-mp/Script/Functions/Worldstate.cpp apps/openmw-mp/Script/Functions/Worldstate.hpp apps/openmw-mp/Script/ScriptFunctions.hpp apps/openmw-mp/processors/player/ProcessorPlayerMap.hpp apps/openmw/mwmp/processors/player/ProcessorPlayerMap.hpp components/openmw-mp/Base/BasePlayer.hpp components/openmw-mp/Packets/Player/PacketPlayerMap.hpp components/openmw-mp/Packets/Worldstate/PacketWorldMap.cpp		2018-06-07 23:23:19 +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	Dropping a separate NPDTstruct12 object and instead use NPDTstruct52	2018-05-09 00:25:07 +02:00
essimporter	Dropping a separate NPDTstruct12 object and instead use NPDTstruct52	2018-05-09 00:25:07 +02:00
launcher	Merge pull request #436 from OpenMW/master	2018-05-23 00:40:51 +03:00
master	[General] Use correct versions of C++ per target	2018-02-16 16:31:45 +08:00
mwiniimporter	Read data paths from data-local section too	2018-05-17 21:07:20 +03:00
niftest	Some PVS-Studio and cppcheck fixes	2018-04-18 12:36:10 +00:00
opencs	Merge pull request #440 from OpenMW/master	2018-05-27 16:10:16 +03:00
openmw	Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts	2018-06-07 23:23:19 +03:00
openmw-mp	Merge pull request #446 from TES3MP/0.6.3 while resolving conflicts	2018-06-07 23:23:19 +03:00
openmw_test_suite	Merge pull request #1698 from Capostrophic/c++11	2018-05-06 10:44:11 +02:00
wizard	Merged pull request #1697	2018-05-23 16:01:11 +02:00
doc.hpp