David Rowe 8dd8ebcbaf Merge branch 'master' into feature/eye-tracking-option ... # Conflicts: # plugins/openvr/src/ViveControllerManager.cpp		2020-07-11 08:14:13 +12:00
..
avatar
config
controllers
fonts
html
icons
images	Add vircadia-banner.svg for login dialogs	2020-06-18 09:12:01 +02:00
mention-sounds
meshes
qml	Merge branch 'master' into feature/eye-tracking-option	2020-07-11 08:14:13 +12:00
QtWebEngine/UIDelegates
serverless
shaders
snapshot/img
sounds
styles
visage