Andrzej Kapolka aaffd023e2 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels		2014-11-12 18:03:54 -08:00
..
animation	remove TARGET_NAME from cmake macros where it is not required	2014-08-08 13:17:54 -07:00
audio	fix for AudioInjector QScriptValue conversion typos	2014-11-11 20:48:34 -08:00
avatars	resolve conflicts on merge with upstream master	2014-11-11 20:53:24 -08:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	Merge pull request #3772 from PhilipRosedale/master	2014-11-11 20:32:46 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into rayPickSubMeshes	2014-10-29 11:56:27 -07:00
metavoxels	Yet more heightfield spanner bits.	2014-11-12 15:40:54 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-11 14:40:34 -08:00
octree	fix a bug produced by not setting deleted var to NULL	2014-11-10 11:03:15 -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-11 20:53:24 -08:00
shared	include c++ header for memset	2014-11-07 17:24:05 -08:00
voxels	fix a bug produced by not setting deleted var to NULL	2014-11-10 11:03:15 -08:00