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
..
+android_interface
+webengine
audio	Fix up scrollbars and separators	2020-01-23 11:25:48 +13:00
avatarapp	Merge branch 'master' into fix/other-renamings	2020-05-18 15:10:32 -04:00
avatarPackager	Merge remote-tracking branch 'refs/remotes/kasen/master'	2020-06-10 02:49:13 +02:00
commerce	Lots of renamings, more to come.	2020-04-07 04:56:02 -04:00
dialogs	Merge remote-tracking branch 'refs/remotes/kasen/master'	2020-06-10 02:49:13 +02:00
models
overlays
simplifiedUI	DEV-2701: Remove the home icon from the profile app	2019-11-06 11:11:57 -08:00
tablet	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00
toolbars
tts
AssetServer.qml
AvatarApp.qml	Remove further related dead code	2019-11-19 10:31:54 +13:00
AvatarPackagerWindow.qml
Card.qml
ComboDialog.qml
Desktop.qml
DesktopLetterboxMessage.qml
DesktopWebEngine.qml
EditAvatarInputsBar.qml
Feed.qml
LetterboxMessage.qml
NameCard.qml
Pal.qml
RootHttpRequest.qml
SkyboxChanger.qml
SpectatorCamera.qml
TabletTextButton.qml
TextButton.qml