motofckr9k 3d05cdd61e Merge remote-tracking branch 'refs/remotes/kasen/master' ... 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		2020-06-10 02:49:13 +02:00
..
AvatarDoctorDiagnose.qml
AvatarDoctorErrorReport.qml
AvatarPackagerApp.qml	Lots of renamings, more to come.	2020-04-07 04:56:02 -04:00
AvatarPackagerFooter.qml
AvatarPackagerHeader.qml	Big rebrand	2020-05-22 20:35:27 +02:00
AvatarPackagerState.qml
AvatarProject.qml	Lots of renamings, more to come.	2020-04-07 04:56:02 -04:00
AvatarProjectCard.qml
AvatarProjectUpload.qml
AvatarUploadStatusItem.qml
ClickableArea.qml
CreateAvatarProject.qml
InfoBox.qml
LoadingCircle.qml
ProjectInputControl.qml
qmldir
RalewayButton.qml
Style.qml