David Cernat b7c6261e16 Merge pull request #392 from OpenMW/master while resolving conflicts ... # Conflicts: # README.md		2018-03-09 21:07:46 +02: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	http to https for supported urls (#1625)	2018-03-08 21:23:24 +01: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