Stephen Birarda 42de553e32 Merge branch 'master' of github.com:worklist/hifi into assignment		2013-10-17 14:51:20 -07:00
..
audio	push various PACKET_TYPES, repairs to Agent for UUID setup	2013-10-17 13:35:53 -07:00
avatars	more repairs to Agent and AvatarData for UUID transition	2013-10-17 14:35:42 -07:00
shared	fix use of htonl in constant outside function	2013-10-17 14:45:38 -07:00
voxel-server-library	resolve conflicts on merge with upstream master	2013-10-17 14:37:58 -07:00
voxels	Merge branch 'master' of github.com:worklist/hifi into assignment	2013-10-17 14:51:20 -07:00