Sam Gateau 8f04eaae1d Merge branch 'master' of github.com:highfidelity/hifi into wall		2019-06-19 16:53:04 -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	Changed qml import method	2019-06-19 10:40:32 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into wall	2019-06-19 16:53:04 -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