You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3mp/extern
David Cernat e355dca4dd Merge pull request #409 from TES3MP/0.6.3 while resolving conflicts
Conflicts:
	apps/openmw-mp/CMakeLists.txt
	apps/openmw-mp/Script/Functions/GUI.cpp
	apps/openmw-mp/Script/Functions/GUI.hpp
	apps/openmw-mp/Script/Functions/Items.hpp
	apps/openmw-mp/Script/Functions/Mechanics.cpp
	apps/openmw-mp/Script/Functions/Mechanics.hpp
	apps/openmw-mp/Script/Functions/Stats.cpp
	apps/openmw-mp/Script/Functions/Stats.hpp
	apps/openmw-mp/Script/ScriptFunctions.cpp
	apps/openmw-mp/Script/ScriptFunctions.hpp
7 years ago
..
breakpad@26b988681d [General] Update submodules 7 years ago
oics http to https for supported urls (#1625) 7 years ago
osg-ffmpeg-videoplayer VideoState::queue_picture: ffmpeg expects a buffer of 4 pointers in sws_scale 7 years ago
osgQt Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) 7 years ago
sol@9a0b5ef34a [General] Update sol submodule to 2.18.5 7 years ago