Brad Hefta-Gaub bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface ... Conflicts: libraries/particles/src/ParticleCollisionSystem.cpp		2014-01-20 10:55:34 -08:00
..
audio	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-15 10:20:21 -08:00
avatars	Hand now holds a ball a bit forward, which prevents the body from colliding with the ball on throw.	2014-01-17 16:36:50 -08:00
embedded-webserver	hook OctreeServer up to embedded-webserver	2014-01-17 14:21:15 -08:00
metavoxels	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-15 10:20:21 -08:00
octree	comment out the JurisdictionListener's connection for now	2014-01-17 15:27:44 -08:00
octree-server	hook OctreeServer up to embedded-webserver	2014-01-17 14:21:15 -08:00
particle-server	fix linking of webserver for octree-server	2014-01-17 14:27:24 -08:00
particles	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-20 10:55:34 -08:00
script-engine	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-20 10:55:34 -08:00
shared	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-20 10:55:34 -08:00
voxel-server	fix linking of webserver for octree-server	2014-01-17 14:27:24 -08:00
voxels	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-17 13:29:36 -08:00