David Rowe 2d070e630b Merge branch 'master' into fix/jsdoc-fixes ... # 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		2020-04-26 20:38:43 +12:00
..
+android_interface
+webengine
audio	Fix up scrollbars and separators	2020-01-23 11:25:48 +13:00
avatarapp	Merge branch 'master' into fix/jsdoc-fixes	2020-04-26 20:38:43 +12:00
avatarPackager	Fix up docs links	2020-01-20 15:06:32 +13:00
commerce	Replace links to docs.highfidelity.com	2020-01-24 10:18:55 +13:00
dialogs	Lint	2020-01-27 13:13:36 -05: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