Zach Fox e79518e092 Merge branch 'master' of github.com:highfidelity/hifi into SUI/integratedStatusEtc		2019-05-21 09:28:02 -07:00
..
compiledResources
external
i18n
icon	- updated console+server icons, installer+uninstaller graphics, and console notification icon	2019-04-26 14:50:18 -07:00
resources	Integrate Status into top bar; improve Audio settings; improve spacing between settings	2019-05-17 17:25:48 -07:00
src	Merge pull request #15588 from sabrina-shanman/bug_myavatar_res-state	2019-05-20 14:31:05 -07:00
ui
CMakeLists.txt	only build qt.conf for DEV macos and unix builds	2019-05-20 15:00:07 -04:00
interface.exe.manifest