Stephen Birarda 60bdd206eb Merge branch 'master' of https://github.com/highfidelity/hifi into android		2015-01-19 12:35:22 -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 pull request #4103 from Atlante45/applications_diet_cpp11	2015-01-14 17:17:07 -08:00
embedded-webserver	rename cmake macro to represent actual purpose	2014-12-18 16:51:20 -08:00
entities	Merge pull request #4124 from AndrewMeadows/inertia	2015-01-16 13:33:44 -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	No more Magic numbers and fixing the code path for linux	2015-01-16 10:26:51 -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	resolve conflicts on merge with upstream master	2015-01-19 10:26:56 -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	merge upstream/master into andrew/bispinor	2015-01-16 15:22:06 -08:00
render-utils	No more Magic numbers and fixing the code path for linux	2015-01-16 10:26:51 -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	resolve conflicts on merge with upstream master	2015-01-19 10:26:56 -08:00