Brad Hefta-Gaub fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface ... Conflicts: libraries/shared/src/PacketHeaders.cpp		2014-01-21 20:21:22 -08:00
..
audio	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-15 10:20:21 -08:00
avatars	Get the base position/orientation directly from the avatar to prevent	2014-01-20 13:44:41 -08:00
embedded-webserver	Compile fixes (perhaps just for my version of Qt/GCC).	2014-01-20 11:41:04 -08:00
metavoxels	Merge branch 'master' of git://github.com/worklist/hifi into windows_build	2014-01-15 10:20:21 -08:00
octree	remove debug code	2014-01-21 14:06:55 -08:00
octree-server	remove debug code	2014-01-21 14:06:55 -08:00
particle-server	implemented support for PACKET_TYPE_PARTICLE_ERASE	2014-01-21 13:24:35 -08:00
particles	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-21 20:21:22 -08:00
script-engine	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-21 20:21:22 -08:00
shared	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface	2014-01-21 20:21:22 -08:00
voxel-server	implemented support for PACKET_TYPE_PARTICLE_ERASE	2014-01-21 13:24:35 -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