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
..
avatar	Put away animation into resource and update script to use local resource path.	2019-11-21 14:50:05 -08:00
config
controllers	Resurrect gamepad Y teleport button	2019-12-08 12:38:48 +13:00
fonts
html	Updated broken urls	2020-01-15 23:08:27 +00:00
icons
images	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00
mention-sounds
meshes
qml	Merge branch 'master' into fix/jsdoc-fixes	2020-04-26 20:38:43 +12:00
QtWebEngine/UIDelegates
serverless	DEV-2463: Put FTUE users in an empty serverless domain instead of the tutorial	2019-10-23 14:32:03 -07:00
shaders
snapshot/img
sounds
styles
visage