Zach Fox f9b51df296 Reduce size of output muted overlay; restore scroll to 0 on settings tab switch		2019-05-14 15:05:26 -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	Reduce size of output muted overlay; restore scroll to 0 on settings tab switch	2019-05-14 15:05:26 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into simplifiedUI	2019-05-14 09:32:07 -07:00
ui
CMakeLists.txt	Merge pull request #14905 from SamGondelman/materialMapping	2019-02-15 11:21:51 -08:00
interface.exe.manifest