ZappoMan 1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels		2013-10-21 16:03:53 -07:00
..
audio	don't attempt to inject if audio mixer has no active socket	2013-10-17 16:49:05 -07:00
avatars	more repairs to Agent and AvatarData for UUID transition	2013-10-17 14:35:42 -07:00
shared	Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels	2013-10-21 16:03:53 -07:00
voxel-server-library	don't attempt to send in UDPSocket with NULL destAddress	2013-10-17 17:01:15 -07:00
voxels	improved VoxelNode delete of children	2013-10-21 14:44:46 -07:00