howard-stearns 0670a4689f Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal		2017-01-05 13:57:44 -08:00
..
external
i18n
icon
resources	Merge branch 'master' of https://github.com/highfidelity/hifi into edit-button-to-select-in-pal	2017-01-05 13:57:44 -08:00
src	Merge pull request #9299 from Atlante45/settings	2017-01-04 17:19:44 -08:00
ui
CMakeLists.txt
interface.exe.manifest