Zach Fox 4bbbaa8c19 Merge branch 'master' of github.com:highfidelity/hifi into SUI/audioListFixes		2019-05-23 09:39:38 -07:00
..
audio	Fix a bug and remove magic numbers	2019-05-22 15:24:33 -07:00
general	Integrate Status into top bar; improve Audio settings; improve spacing between settings	2019-05-17 17:25:48 -07:00
vr	Fix BUGZ-311	2019-05-22 16:24:40 -07:00
SettingsApp.qml	Simplified UI v1	2019-05-10 10:49:25 -07:00