ZappoMan c58f44f54a Merge pull request #1735 from AndrewMeadows/fix-particle-avatar-collisions ... Fix crash on shutdown caused by duplicate delete on a QObject		2014-01-29 17:54:23 -08:00
..
audio	Missing includes.	2014-01-29 13:47:13 -08:00
avatars	Merge pull request #1735 from AndrewMeadows/fix-particle-avatar-collisions	2014-01-29 17:54:23 -08:00
embedded-webserver	serve a 301 redirect when trailing slash is missing, closes #1712	2014-01-28 16:25:04 -08:00
metavoxels	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-29 13:34:19 -08:00
octree	resolve conflicts on merge with upstream master	2014-01-29 12:23:06 -08:00
octree-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
particle-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
particles	fix Particle update signature	2014-01-29 12:30:20 -08:00
script-engine	resolve conflicts on merge with upstream master	2014-01-29 12:23:06 -08:00
shared	Missing includes.	2014-01-29 13:47:13 -08:00
voxel-server	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
voxels	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00