RebeccaStankus 37304f57ea Merge branch 'master' of github.com:highfidelity/hifi into feetposition		2019-08-30 14:20:58 -07:00
..
compiledResources
external
i18n
icon	fixed icon name spacing	2019-08-27 20:13:15 +02:00
resources	Merge pull request #16120 from jherico/fix/bugz-1365	2019-08-30 13:10:09 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into feetposition	2019-08-30 14:20:58 -07:00
ui
CMakeLists.txt	changing app name to high fidelity and changing icons to the new logo	2019-08-27 20:08:21 +02:00
interface.exe.manifest