amerhifi 68681fdb2e Merge branch 'master' into amer-dev471-re		2019-10-21 21:04:24 -07:00
..
audio	adding hmd audio device info to deviceslist	2019-10-18 15:29:10 -07:00
dev	Controls almost done	2019-08-16 15:53:30 -07:00
general	Restate legacy first person camera mode	2019-10-17 13:26:42 -07:00
images	DEV-128: Update settings screen with latest design	2019-06-12 14:22:02 -07:00
vr	adding hmd audio device info to deviceslist	2019-10-18 15:29:10 -07:00
SettingsApp.qml	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 14:04:35 -07:00