mirror of
https://github.com/HifiExperiments/overte.git
synced 2025-08-13 21:59:44 +02:00
# Resolved Conflicts: # interface/src/avatar/MyAvatar.h # interface/src/avatar/OtherAvatar.cpp |
||
---|---|---|
.. | ||
src/avatars-renderer | ||
CMakeLists.txt |