Atlante45 f77fab2fe0 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11		2015-01-13 20:38:52 -08:00
..
animation	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
avatars	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 11:03:14 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	fix for bad cleanup (3 places)	2015-01-13 14:21:41 -08:00
entities-renderer	remove lock at EntityTreeRenderer::loadEntityScript	2015-01-11 10:44:36 -08:00
environment	more voxel-ectomy cleaning up some remaining references to voxels	2015-01-06 09:27:48 -08:00
fbx	Merge pull request #4093 from samcake/temp0	2015-01-13 17:11:17 -08:00
gpu	fixed pointers which were using 0 instead of NULL and syntax in resource.h	2014-12-22 11:20:04 -08:00
metavoxels	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
model	FIx typos	2014-12-22 15:44:46 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
octree	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
physics	fix for glitchy physics updates	2015-01-13 14:00:37 -08:00
render-utils	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11	2015-01-13 20:38:52 -08:00