mirror of
https://github.com/lubosz/overte.git
synced 2025-08-27 05:45:42 +02:00
Conflicts: interface/resources/qml/HifiMenu.qml interface/resources/qml/MessageDialog.qml interface/resources/qml/Root.qml interface/resources/qml/TestRoot.qml interface/resources/qml/controls/Dialog.qml interface/src/Application.cpp interface/src/ui/LoginDialog.cpp libraries/ui/src/MessageDialog.cpp libraries/ui/src/MessageDialog.h libraries/ui/src/OffscreenQmlDialog.h libraries/ui/src/OffscreenUi.cpp libraries/ui/src/OffscreenUi.h tests/ui/src/main.cpp |
||
---|---|---|
.. | ||
src | ||
CMakeLists.txt |