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		2017-10-16 07:37:29 +03:00
..
breakpad@e6d1c032ba	Add breakpad to server	2016-10-23 17:07:46 +08:00
LuaBridge	Syncing inventory, animations, position, 8 key attributes	2016-07-07 23:50:48 +08:00
oics	Fix joystick binding for an action being discarded when default for another action is loaded (Bug #3900)	2017-06-25 14:44:17 +02:00
osg-ffmpeg-videoplayer	Merge changes to coverity scan script	2017-10-15 17:06:58 +02:00
osgQt	Clang warning fix	2016-08-14 15:20:52 +02:00