ZappoMan 6cf8ec32a7 Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: libraries/avatars/src/AvatarData.cpp libraries/avatars/src/AvatarData.h		2013-05-20 12:31:35 -07:00
..
audio	some fixes for new audio injector setup	2013-05-17 15:42:37 -07:00
avatars	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-20 12:31:35 -07:00
shared	Support for eye offset position/orientation in camera/frustum.	2013-05-19 18:37:21 -07:00
voxels	Tabs -> spaces, spacing fix.	2013-05-20 09:38:01 -07:00