David Cernat c20a0c72c5 Merge pull request #442 from OpenMW/master while resolving conflicts ... # Conflicts: # CMakeLists.txt		2018-06-04 19:34:26 +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 UTF-8 econding	2018-06-03 13:46:10 +03: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	Fix build with Qt 5.11_beta3 (dropping qt5_use_modules)	2018-04-17 23:03:56 +02:00