Andrzej Kapolka 2226d722cf Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: libraries/shared/src/PacketHeaders.h		2013-05-06 13:31:46 -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	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-06 13:31:46 -07:00
voxels	Starting on environment bits.	2013-05-06 13:30:07 -07:00