Howard Stearns 2070e9a173 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory		2019-01-25 15:40:04 -08:00
..
compiledResources
external
i18n
icon	New icons for interface and server-console	2019-01-11 14:50:13 -08:00
resources	Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory	2019-01-25 15:40:04 -08:00
src	Merge pull request #14711 from SamGondelman/NOverlays10	2019-01-25 14:00:52 -08:00
ui
CMakeLists.txt
interface.exe.manifest