samcake 737fdf9dd8 Merge branch 'master' of https://github.com/highfidelity/hifi into brown		2017-05-10 17:28:07 -07:00
..
external
i18n
icon
resources
src	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-10 17:28:07 -07:00
ui
CMakeLists.txt
interface.exe.manifest