mirror of
https://github.com/overte-org/overte.git
synced 2025-04-08 01:52:31 +02:00
Conflicts: BUILD_WIN.md CODING_STANDARD.md LICENSE cmake/installer/installer-header.bmp cmake/installer/installer.ico cmake/installer/uninstaller-header.bmp interface/resources/images/about-vircadia.png interface/resources/images/vircadia-logo.svg interface/resources/qml/LoginDialog.qml interface/resources/qml/dialogs/TabletLoginDialog.qml interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml interface/src/Application.cpp pkg-scripts/athena-server.spec scripts/system/more/app-more.js scripts/system/more/css/styles.css scripts/system/more/more.html |
||
---|---|---|
.. | ||
install-folder.rsrc | ||
installer-header.bmp | ||
installer.ico | ||
Thumbs.db | ||
uninstaller-header.bmp |