Roxanne Skelly 70cc6594c7 CR fixes		2019-03-08 12:43:43 -08:00
..
compiledResources
external
i18n
icon	New icons for interface and server-console	2019-01-11 14:50:13 -08:00
resources	CR fixes	2019-03-08 12:43:43 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags	2019-03-08 11:41:34 -08:00
ui
CMakeLists.txt	Merge pull request #14905 from SamGondelman/materialMapping	2019-02-15 11:21:51 -08:00
interface.exe.manifest