Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-06 20:13:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries/ui
History
David Rowe a782b6779a Merge branch 'master' into 21709 
# Conflicts:
#	interface/src/ui/overlays/Overlays.h
#	interface/src/ui/overlays/Shape3DOverlay.cpp
#	libraries/entities/src/EntityItemProperties.cpp
#	libraries/entities/src/EntityScriptingInterface.h
2018-02-28 12:42:05 +13:00
..
src Merge branch 'master' into 21709 2018-02-28 12:42:05 +13:00
CMakeLists.txt Migrating QML rendering off the main thread 2018-02-06 11:53:09 -08:00