NissimHadar 6e3ead0c5f Merge branch 'master' of https://github.com/highfidelity/hifi into MAC		2018-11-12 14:00:24 -08:00
..
compiledResources
external
i18n
icon
resources	Merge pull request #14159 from alexiamandeville/WoodyUpdate	2018-11-12 12:12:49 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-12 14:00:24 -08:00
ui
CMakeLists.txt	Vcpkg migration	2018-11-08 12:28:06 -08:00
interface.exe.manifest