Stephen Birarda 6038c33fe6 Merge branch 'master' of https://github.com/highfidelity/hifi		2014-07-03 11:12:19 -07:00
..
animation	put back ssize_t definition	2014-05-20 11:56:06 -07:00
audio	Merge branch 'master' of https://github.com/highfidelity/hifi into replace_qnetworkaccessmanager	2014-07-02 16:06:41 -07:00
avatars	Switched AvatarData to NetworkAccessManager	2014-07-01 17:46:23 -07:00
embedded-webserver	handle serving of scripts at temp unique UUIDs	2014-05-23 12:33:39 -07:00
fbx	Merge branch 'master' of https://github.com/highfidelity/hifi into sit_on_a_model	2014-06-25 10:49:51 -07:00
metavoxels	Include an additional bit with the objects that says whether what follows is	2014-06-30 12:35:34 -07:00
models	Fix crash occuring when geometry not yet available	2014-06-27 09:56:03 -07:00
networking	Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback	2014-07-02 21:45:19 -07:00
octree	fixed warnings	2014-06-30 16:10:58 -07:00
particles	Removed Xcode warnings	2014-07-02 15:57:11 -07:00
script-engine	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-03 11:12:19 -07:00
shared	merge upstream/master into andrew/ragdoll	2014-07-03 09:27:52 -07:00
voxels	Allow the project to compile using Visual Studio 2013	2014-06-18 10:27:57 +03:00