Stephen Birarda 0f32346324 resolve conflicts on merge with upstream master		2014-11-07 09:10:12 -08:00
..
animation
audio	Merge pull request #3747 from PhilipRosedale/master	2014-11-06 10:36:46 -08:00
avatars	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	cleanup	2014-11-06 14:00:26 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
metavoxels	move metavoxels library to tbb concurrent map	2014-11-06 13:44:03 -08:00
networking	resolve conflicts on merge with upstream master	2014-11-07 09:10:12 -08:00
octree	resolve conflicts on merge with upstream master	2014-11-07 09:10:12 -08:00
physics	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
script-engine	resolve conflicts on merge with upstream master	2014-11-07 09:10:12 -08:00
shared	remove getpid usage and replace with Qt solution	2014-11-05 11:42:40 -08:00
voxels	Removed redundant TREE_SCALE declaration	2014-10-09 11:48:41 -07:00