Andrew Meadows 02c58447df merge upstream/master into "shapes" project ... Conflicts: interface/src/avatar/MyAvatar.cpp interface/src/avatar/SkeletonModel.cpp interface/src/avatar/SkeletonModel.h libraries/avatars/src/HandData.h libraries/shared/src/SharedUtil.h		2014-03-18 12:41:20 -07:00
..
audio	cleanup writing of silent frame to ring buffer	2014-03-18 11:12:36 -07:00
avatars	merge upstream/master into "shapes" project	2014-03-18 12:41:20 -07:00
embedded-webserver	click harder	2014-03-08 18:22:30 -08:00
metavoxels	Allow streaming uints.	2014-03-12 13:03:59 -07:00
octree	use unsigned int vs size_t, since that just seems more correct	2014-03-16 11:07:24 -07:00
particles	fixes for warnings produced by Xcode 5.1	2014-03-11 11:45:13 -07:00
script-engine	have agent optionally send silent stream flag	2014-03-17 16:38:39 -07:00
shared	resolve conflicts on merge with upstream master	2014-03-18 10:37:04 -07:00
voxels	more warnings fixes	2014-03-15 22:00:44 -07:00