Sam Gateau f38fa14a39 Merge branch 'master' of https://github.com/highfidelity/hifi into blue		2017-10-24 21:00:44 -07:00
..
external
i18n
icon
resources	Merge pull request #11652 from cain-kilgore/21508	2017-10-23 12:22:21 -07:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-24 21:00:44 -07:00
ui
CMakeLists.txt
interface.exe.manifest