overte-JulianGro/libraries/avatars
luiscuenca a7f143dbce Merge branch 'master' into multiSphereAvatar04
# Resolved Conflicts:
#	interface/src/avatar/MyAvatar.h
#	interface/src/avatar/OtherAvatar.cpp
2019-01-15 18:27:04 -07:00
..
src Merge branch 'master' into multiSphereAvatar04 2019-01-15 18:27:04 -07:00
CMakeLists.txt wip live material swapping on model entities, model overlays, avatars, 2018-02-09 12:00:08 -08:00