overte/libraries/avatars-renderer
luiscuenca 39dc25ea92 Merge branch 'master' into multiSphereAvatar04
# Conflicts:
#	interface/src/avatar/OtherAvatar.h
#	libraries/avatars-renderer/src/avatars-renderer/Avatar.h
2019-01-08 15:41:33 -07:00
..
src/avatars-renderer Merge branch 'master' into multiSphereAvatar04 2019-01-08 15:41:33 -07:00
CMakeLists.txt Switch references to HFM to the HFM lib and remove HFM classes in FBX 2018-11-05 12:47:34 -08:00