Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-Armored-Dragon/libraries/ui
History
David Rowe 1a745094e2 Merge branch 'master' into 21055 
Conflicts:
	libraries/entities-renderer/src/RenderableWebEntityItem.cpp
	libraries/gl/src/gl/OffscreenQmlSurface.h
2016-10-06 09:29:09 +13:00
..
src Merge branch 'master' into 21055 2016-10-06 09:29:09 +13:00
CMakeLists.txt Revert "Revert "Migrate QML based web views to Qt WebEngine"" 2015-12-18 17:18:46 -08:00