Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 02:04:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/interface
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
..
external
i18n
icon
resources Merge branch 'master' into 21055 2016-10-06 09:29:09 +13:00
src Merge branch 'master' into 21055 2016-10-06 09:29:09 +13:00
ui
CMakeLists.txt Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio 2016-09-06 20:56:20 -07:00
interface.exe.manifest