Commit graph

2 commits

Author SHA1 Message Date
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
Andrzej Kapolka
61f6b8b974 Moved all the avatar bits to their own subdirectory. 2013-07-11 14:53:46 -07:00
Renamed from interface/src/Skeleton.cpp (Browse further)