David Cernat 1a8a518897 Merge pull request #376 from TES3MP/0.6.3 while resolving conflicts ... Conflicts: README.md apps/openmw-mp/Script/Functions/World.cpp apps/openmw/mwmp/LocalPlayer.cpp apps/openmw/mwmp/LocalPlayer.hpp apps/openmw/mwworld/scene.cpp components/openmw-mp/Version.hpp		2018-01-29 02:57:48 +02:00
..
breakpad@26b988681d	[General] Update submodules	2017-08-30 17:10:37 +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	VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale	2018-01-21 12:21:22 -05:00
osgQt	Clang warning fix	2016-08-14 15:20:52 +02:00
sol@9a0b5ef34a	[General] Update sol submodule to 2.18.5	2017-11-01 22:27:52 +08:00