Seth Alves d095d4ef44 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3		2017-12-08 07:19:33 -08:00
..
external
i18n
icon
resources	Merge pull request #11874 from luiscuenca/audioscope	2017-12-08 07:15:28 -08:00
src	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-08 07:19:33 -08:00
ui
CMakeLists.txt	Merge pull request #11612 from highfidelity/pointers	2017-10-20 13:53:52 -07:00
interface.exe.manifest