Sam Gateau afdc323622 Merge branch 'nut' of github.com:samcake/hifi into nut		2019-06-05 17:56:34 -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	Merge pull request #15657 from zfox23/newPerformanceAPI	2019-05-31 15:31:07 -07:00
src	Merge branch 'nut' of github.com:samcake/hifi into nut	2019-06-05 17:56:34 -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