samcake 559d436dfa Fixing the merge conflicts		2018-05-24 16:57:10 -07:00
..
compiledResources
external
i18n
icon
resources	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
src	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
ui
CMakeLists.txt	merge 'master' into 'workload'	2018-04-20 15:07:46 -07:00
interface.exe.manifest