ZappoMan a54e401377 Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration ... Conflicts: libraries/script-engine/src/Vec3.cpp		2014-03-05 18:04:57 -08:00
..
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes	2014-03-03 16:31:25 -08:00
avatars	Merge pull request #2190 from AndrewMeadows/shapes	2014-03-05 17:59:42 -08:00
embedded-webserver	replace deprecated qt5 macros in cmake with target_link_libraries	2014-03-04 12:41:24 -08:00
metavoxels	Merge pull request #2202 from birarda/authentication	2014-03-04 18:30:22 -08:00
octree	cleanup headers	2014-03-05 02:42:49 -08:00
particles	added penetration support to particle collisions JS callbacks	2014-03-05 15:03:54 -08:00
script-engine	added penetration support to particle collisions JS callbacks	2014-03-05 15:03:54 -08:00
shared	Merge pull request #2190 from AndrewMeadows/shapes	2014-03-05 17:59:42 -08:00
voxels	Merge pull request #2202 from birarda/authentication	2014-03-04 18:30:22 -08:00