milad 5fdcf0ecaf updated setting name and changed default value to true for show tray		2019-09-04 12:59:17 -07:00
..
audio	Controls almost done	2019-08-16 15:53:30 -07:00
dev	Controls almost done	2019-08-16 15:53:30 -07:00
general	updated setting name and changed default value to true for show tray	2019-09-04 12:59:17 -07:00
images	DEV-128: Update settings screen with latest design	2019-06-12 14:22:02 -07:00
vr	Controls almost done	2019-08-16 15:53:30 -07:00
SettingsApp.qml	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-20 14:04:35 -07:00