Zach Fox 971e07c646 update spacing between settings		2019-05-14 16:44:25 -07:00
..
compiledResources
external
i18n
icon
resources	update spacing between settings	2019-05-14 16:44:25 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI	2019-05-14 09:32:07 -07:00
ui
CMakeLists.txt
interface.exe.manifest