mirror of
https://github.com/overte-org/overte.git
synced 2025-04-25 14:13:47 +02:00
Conflicts: domain-server/src/DomainServer.cpp interface/src/Application.cpp interface/src/Menu.cpp libraries/avatars/src/AvatarData.h libraries/shared/src/NodeList.h |
||
---|---|---|
.. | ||
resources/web | ||
src | ||
CMakeLists.txt |