Philip Rosedale 03869e81fd Merge pull request #1380 from birarda/qt-for-portaudio ... move from 44.1 to 48 on audio		2013-12-16 17:58:41 -08:00
..
audio	Merge pull request #1380 from birarda/qt-for-portaudio	2013-12-16 17:58:41 -08:00
avatars	Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions	2013-12-16 12:11:33 -08:00
octree	temp remove debug verbosity	2013-12-16 11:36:19 -08:00
octree-server	particle tree pruning on update	2013-12-12 15:09:30 -08:00
particle-server	removed some debugging	2013-12-12 11:07:13 -08:00
particles	use findSpherePenetration() which fixes target zone detection of particles	2013-12-16 15:03:45 -08:00
scriptengine	fixed file banner	2013-12-16 12:13:36 -08:00
shared	temp remove debug verbosity	2013-12-16 11:36:19 -08:00
voxel-server	attempt to fix build buster	2013-12-04 21:29:25 -08:00
voxels	implement OctreeScriptingInterface base class to share common behavior for particle and voxel scripting	2013-12-14 13:25:33 -08:00