Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-03 09:51:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte/domain-server/resources
History
Sam Gateau bd5c6517a5 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 
Conflicts:
	interface/src/ui/MetavoxelEditor.cpp
	interface/src/ui/overlays/Sphere3DOverlay.cpp
2014-10-03 17:31:05 -07:00
..
web Replacing glutSolidSphere by a cached Geometry 2014-10-03 16:55:58 -07:00
describe-settings.json Merge pull request #3537 from Atlante45/move_att_setting 2014-10-03 15:30:58 -07:00