David Cernat fa3baac0f3 Merge pull request #228 from OpenMW/master while resolving conflicts ... # Conflicts: # .travis.yml # CMakeLists.txt # apps/openmw/main.cpp		2017-06-18 18:16:10 +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	replace and purge boost::lexical_cast	2017-06-09 19:08:53 +02:00
osg-ffmpeg-videoplayer	algo needed for std::min/max in msvc2013	2017-06-10 09:09:30 +02:00
osgQt	Clang warning fix	2016-08-14 15:20:52 +02:00