birarda 67bab7e73d Merge pull request #342 from birarda/voxel-noise ... use stream identifier to match injected audio across packets		2013-05-17 15:07:29 -07:00
..
audio	attach stream identifier to AudioRingBuffer to match incoming data in audio mixer	2013-05-17 14:57:10 -07:00
avatars	have addOrUpdateAgent return a pointer to the agent instead of a bool	2013-05-17 14:03:15 -07:00
shared	Merge pull request #342 from birarda/voxel-noise	2013-05-17 15:07:29 -07:00
voxels	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-14 14:44:22 -07:00