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-tes3mp/apps
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
7 years ago
..
browser [Browser] Fix crashing of browser (I hope) 8 years ago
bsatool Restore trailing new lines to shrink PR 7 years ago
esmtool Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 7 years ago
essimporter Dropping a separate NPDTstruct12 object and instead use NPDTstruct52 7 years ago
launcher Merge pull request #456 from OpenMW/master while resolving conflicts 7 years ago
master [Master] Fix REST servers/info 8 years ago
mwiniimporter Fix MSVC warnings C4456 7 years ago
niftest Some PVS-Studio and cppcheck fixes 7 years ago
opencs Merge pull request #457 from OpenMW/master while resolving conflicts 7 years ago
openmw Merge pull request #457 from OpenMW/master while resolving conflicts 7 years ago
openmw-mp [General] Allow followers to follow non-authority players through cells 7 years ago
openmw_test_suite Merge pull request #1698 from Capostrophic/c++11 7 years ago
wizard Merged pull request #1697 7 years ago
doc.hpp