Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 11:10:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries
History
ZappoMan e524ed889e Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 
Conflicts:
	libraries/voxels/src/VoxelTree.cpp
	libraries/voxels/src/VoxelTree.h
2013-08-21 13:48:23 -07:00
..
audio fix quoted includes in AudioInjector.cpp 2013-08-05 10:28:12 -07:00
avatars some spacing cleanup in AvatarData 2013-08-15 16:06:48 -07:00
shared cleanup, handle no JurisdictionMap case in JurisidictionSender 2013-08-20 11:22:51 -07:00
voxels Merge branch 'master' of https://github.com/worklist/hifi into threaded_voxel_server 2013-08-21 13:48:23 -07:00