Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-27 23:10:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
overte/domain-server
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
..
resources Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2014-10-03 17:31:05 -07:00
src make the ice server const scoped to remove warning 2014-10-03 15:29:16 -07:00
CMakeLists.txt don't symlink the web directory on WIN32 2014-09-26 15:19:40 -07:00