Andrew Meadows 4cf9673dbb Merge master into 22007-hifiQtBuildv2		2019-05-15 14:10:30 -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 #15538 from zfox23/simplifiedUI	2019-05-14 17:45:30 -07:00
src	Merge pull request #15513 from ctrlaltdavid/M22147	2019-05-15 12:17:12 -07:00
ui
CMakeLists.txt	fix qt.conf location for MacOS	2019-05-15 09:34:08 -07:00
interface.exe.manifest