overte-HifiExperiments/libraries/shared
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 Merge branch 'master' into multiSphereAvatar04 2019-01-08 15:41:33 -07:00
CMakeLists.txt Merge pull request #12205 from jherico/no_widgets 2018-02-05 15:32:54 -08:00