mirror of
https://github.com/overte-org/overte.git
synced 2025-08-04 02:03:36 +02:00
Conflicts: interface/src/DataServerClient.cpp interface/src/avatar/MyAvatar.cpp libraries/avatars/src/AvatarData.h |
||
---|---|---|
.. | ||
src | ||
CMakeLists.txt |