Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-13 19:33:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
overte-HifiExperiments/libraries
History
ZappoMan 2be85d439b Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 
Conflicts:
	interface/src/Application.cpp
	interface/src/VoxelPacketProcessor.cpp
	libraries/voxels/src/VoxelEditPacketSender.cpp
2013-08-19 11:13:38 -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 Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions 2013-08-19 11:13:38 -07:00
voxels first cut at JurisdictionSender and related changes 2013-08-19 11:05:29 -07:00