Andrzej Kapolka 4d33c462fe Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: libraries/voxels/src/VoxelTree.h		2013-05-06 09:45:57 -07:00
..
avatars	(1) added a few methods to orientation; (2) fixed Eve's height; (3) added pitch and roll members to Avatar (not used yet); added avatar pull from handshake;	2013-05-01 15:38:55 -07:00
shared	don't replay last buffer for silent agent	2013-05-01 10:57:59 -07:00
voxels	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-06 09:45:57 -07:00