ZappoMan 333f323856 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode		2014-11-25 12:46:18 -08:00
..
animation	cleanup	2014-11-12 16:57:42 -08:00
audio	Merge pull request #3835 from birarda/lobby	2014-11-19 16:59:54 -08:00
avatars	No more .f	2014-11-19 16:53:39 -08:00
embedded-webserver	Replacing glutSolidSphere by a cached Geometry	2014-10-03 16:55:58 -07:00
entities	more correct entity list maintenance	2014-11-24 20:37:09 -08:00
fbx	Fixed syntax issues and review critics, put all the debugging code in a #define block	2014-11-24 15:24:20 -08:00
metavoxels	Removed a debug statemen.	2014-11-20 17:34:37 -08:00
networking	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-11-20 11:26:29 -08:00
octree	No more .f	2014-11-19 16:53:39 -08:00
physics	No more .f	2014-11-19 16:53:39 -08:00
script-engine	Merge branch 'master' of https://github.com/worklist/hifi	2014-11-13 16:38:01 -08:00
shared	Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode	2014-11-25 12:46:18 -08:00
voxels	fix a bug produced by not setting deleted var to NULL	2014-11-10 11:03:15 -08:00