Sam Gateau 04c139c172 Merge branch 'master' of github.com:highfidelity/hifi into coco		2019-05-15 15:01:46 -07:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #15538 from zfox23/simplifiedUI	2019-05-14 17:45:30 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into coco	2019-05-15 15:01:46 -07:00
ui
CMakeLists.txt
interface.exe.manifest