Seth Alves 73b21f7cd5 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3		2017-12-05 06:55:10 -08:00
..
external
i18n
icon
resources	Merge pull request #11912 from ElderOrb/FB9461	2017-12-04 16:49:25 -06:00
src	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-05 06:55:10 -08:00
ui
CMakeLists.txt
interface.exe.manifest