mirror of
https://github.com/overte-org/overte.git
synced 2025-04-09 11:22:26 +02:00
# Conflicts: # interface/resources/qml/hifi/avatarapp/MessageBoxes.qml # interface/resources/qml/hifi/commerce/checkout/Checkout.qml # interface/resources/qml/hifi/commerce/purchases/Purchases.qml # interface/src/Application.cpp |
||
---|---|---|
.. | ||
src | ||
CMakeLists.txt |