David Back 46d265e3f1 Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservices		2017-12-07 10:13:55 -08:00
..
external
i18n
icon
resources	Merge pull request #11942 from ctrlaltdavid/21633	2017-12-07 09:19:43 -08:00
src	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservices	2017-12-07 10:13:55 -08:00
ui
CMakeLists.txt
interface.exe.manifest