You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/apps
David Cernat e355dca4dd Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/GUI.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
7 years ago
..
browser [Browser] Add compatibility compilation mode 7 years ago
bsatool Restore trailing new lines to shrink PR 7 years ago
esmtool Some PVS-Studio and cppcheck fixes 7 years ago
essimporter ESS-Importer: Convert magic projectiles (Closes #2320) 7 years ago
launcher Merge pull request #408 from OpenMW/master 7 years ago
master [General] Use correct versions of C++ per target 7 years ago
mwiniimporter Restore trailing new lines to shrink PR 7 years ago
niftest Some PVS-Studio and cppcheck fixes 7 years ago
opencs Merge pull request #408 from OpenMW/master 7 years ago
openmw Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 7 years ago
openmw-mp Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts 7 years ago
openmw_test_suite Label gtest directories as system 7 years ago
wizard Some PVS-Studio and cppcheck fixes 7 years ago
doc.hpp