Zach Fox 378bf911d4 Fix another build error		2018-11-06 12:48:17 -08:00
..
compiledResources
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into textToSpeech	2018-11-06 10:29:05 -08:00
src	Fix another build error	2018-11-06 12:48:17 -08:00
ui
CMakeLists.txt
interface.exe.manifest