Stephen Birarda 8549e9cb53 resolve conflicts on merge with upstream master		2014-12-15 09:36:17 -08:00
..
animation	fixes the stutter in animation when observer moves	2014-11-28 17:36:55 -08:00
audio	Add ability to set injector properties during playing, and orbitingSound.js	2014-12-05 08:45:00 -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	Merge pull request #3934 from ZappoMan/bugfixes	2014-12-09 18:08:14 -08:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-10 15:23:27 -08:00
gpu	trying to fix the linux compilation	2014-12-05 13:43:04 -08:00
metavoxels	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
networking	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
octree	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
physics	No more .f	2014-11-19 16:53:39 -08:00
script-engine	resolve conflicts on merge with upstream master	2014-12-03 13:11:56 -08:00
shared	resolve conflicts on merge with upstream master	2014-12-15 09:36:17 -08:00
voxels	OctreeServer::createTree() is now protected	2014-12-02 11:13:37 -08:00