mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01: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 |