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/extern
David Cernat a083439139 Merge pull request #469 from davidcernat/master while resolving conflicts
# Conflicts:
#	apps/openmw/main.cpp
#	apps/openmw/mwbase/world.hpp
#	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
#	apps/openmw/mwmechanics/actors.cpp
#	apps/openmw/mwscript/dialogueextensions.cpp
#	apps/openmw/mwworld/worldimp.hpp
6 years ago
..
LuaBridge Syncing inventory, animations, position, 8 key attributes 9 years ago
breakpad@e6d1c032ba Add breakpad to server 8 years ago
oics Do not use fall-through 6 years ago
osg-ffmpeg-videoplayer VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale 7 years ago
osgQt Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 7 years ago