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/extern
David Cernat e164e6305e Merge pull request #313 from OpenMW/master while resolving conflicts
# Conflicts:
#	.travis.yml
#	CMakeLists.txt
#	apps/openmw/mwgui/jailscreen.cpp
#	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
7 years ago
..
LuaBridge Syncing inventory, animations, position, 8 key attributes 8 years ago
breakpad@e6d1c032ba Add breakpad to server 8 years ago
oics Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900) 7 years ago
osg-ffmpeg-videoplayer Merge changes to coverity scan script 7 years ago
osgQt Clang warning fix 8 years ago