Howard Stearns f16eb1c029 Merge branch 'master' of github.com:highfidelity/hifi into artist-stocking-inventory		2019-02-15 15:15:13 -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-02-15 15:15:13 -08:00
src	Merge pull request #14918 from ctrlaltdavid/M21128	2019-02-15 14:15:13 -08:00
ui
CMakeLists.txt	Merge pull request #14905 from SamGondelman/materialMapping	2019-02-15 11:21:51 -08:00
interface.exe.manifest