Andrzej Kapolka c46d0f4d56 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-10-30 11:37:36 -07:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	Cleanup	2014-10-24 15:02:09 -07: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	removed debug	2014-10-30 11:26:48 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
metavoxels	More resolution bits.	2014-10-29 13:00:32 -07:00
networking	Merge pull request #3661 from Atlante45/reverb_fixed	2014-10-28 18:11:14 -07:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
physics	move stuff out of shared and into physics library	2014-10-28 13:51:45 -07:00
script-engine	don't replace url query in XMLHttpRequest class	2014-10-29 13:20:21 -07:00
shared	final tweak for linux unistd include	2014-10-30 10:03:36 -07:00
voxels	Removed redundant TREE_SCALE declaration	2014-10-09 11:48:41 -07:00