Zach Fox c13697803d Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd		2019-08-16 12:14:44 -07:00
..
compiledResources
external
i18n
icon	- updated console+server icons, installer+uninstaller graphics, and console notification icon	2019-04-26 14:50:18 -07:00
resources	Impelement settingChanged; clean up some emoteIndicatorVisible code	2019-08-15 17:00:27 -07:00
src	Merge branch 'master' of github.com:highfidelity/hifi into emojiAppAdd	2019-08-16 12:14:44 -07:00
ui
CMakeLists.txt	Revert "Merge pull request #15944 from danteruiz/add-signing"	2019-07-23 09:38:32 -07:00
interface.exe.manifest