Andrzej Kapolka 6c587af6ac Merge branch 'master' of https://github.com/worklist/hifi into pointy ... Conflicts: interface/src/avatar/Head.cpp		2013-07-15 13:13:51 -07:00
..
Avatar.cpp	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-15 13:13:51 -07:00
Avatar.h	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-15 13:13:51 -07:00
AvatarTouch.cpp	Moved all the avatar bits to their own subdirectory.	2013-07-11 14:53:46 -07:00
AvatarTouch.h	Moved all the avatar bits to their own subdirectory.	2013-07-11 14:53:46 -07:00
AvatarVoxelSystem.cpp	Moved all the avatar bits to their own subdirectory.	2013-07-11 14:53:46 -07:00
AvatarVoxelSystem.h	Moved all the avatar bits to their own subdirectory.	2013-07-11 14:53:46 -07:00
Face.cpp	Working on mesh rendering for faces.	2013-07-15 13:12:22 -07:00
Face.h	Working on mesh rendering for faces.	2013-07-15 13:12:22 -07:00
Hand.cpp	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-12 15:34:55 -07:00
Hand.h	Moved all the avatar bits to their own subdirectory.	2013-07-11 14:53:46 -07:00
HandControl.cpp	Moved all the avatar bits to their own subdirectory.	2013-07-11 14:53:46 -07:00
HandControl.h	Moved all the avatar bits to their own subdirectory.	2013-07-11 14:53:46 -07:00
Head.cpp	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-15 13:13:51 -07:00
Head.h	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-15 13:13:51 -07:00
Skeleton.cpp	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-15 13:13:51 -07:00
Skeleton.h	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-15 13:13:51 -07:00