mirror of
https://github.com/JulianGro/overte.git
synced 2025-04-12 18:32:21 +02:00
# Resolved Conflicts: # interface/src/avatar/MyAvatar.h # interface/src/avatar/OtherAvatar.cpp |
||
---|---|---|
.. | ||
src | ||
CMakeLists.txt |
# Resolved Conflicts: # interface/src/avatar/MyAvatar.h # interface/src/avatar/OtherAvatar.cpp |
||
---|---|---|
.. | ||
src | ||
CMakeLists.txt |