1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
openmw-tes3mp/apps
David Cernat 98eece808b Merge pull request #427 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/Objects.cpp
	apps/openmw-mp/Script/Functions/Objects.hpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
2018-05-15 21:10:47 +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 #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 #420 from OpenMW/master 2018-05-12 06:32:01 +03:00
openmw Merge pull request #427 from TES3MP/0.6.3 while resolving conflicts 2018-05-15 21:10:47 +03:00
openmw-mp Merge pull request #427 from TES3MP/0.6.3 while resolving conflicts 2018-05-15 21:10:47 +03:00
openmw_test_suite Merge pull request #1698 from Capostrophic/c++11 2018-05-06 10:44:11 +02:00
wizard Some PVS-Studio and cppcheck fixes 2018-04-18 12:36:10 +00:00
doc.hpp