David Rowe 2d070e630b Merge branch 'master' into fix/jsdoc-fixes ... # Conflicts: # interface/resources/qml/hifi/avatarapp/MessageBoxes.qml # interface/resources/qml/hifi/commerce/checkout/Checkout.qml # interface/resources/qml/hifi/commerce/purchases/Purchases.qml # interface/src/Application.cpp		2020-04-26 20:38:43 +12:00
..
compiledResources
external	remove old/unused eyetracker code	2019-09-17 09:43:32 -07:00
i18n
icon	Change interface icons to Kasen logo.	2019-12-11 09:21:43 -06:00
resources	Merge branch 'master' into fix/jsdoc-fixes	2020-04-26 20:38:43 +12:00
src	Merge branch 'master' into fix/jsdoc-fixes	2020-04-26 20:38:43 +12:00
ui	Specified color on text edit for console	2019-10-29 15:46:16 -07:00
CMakeLists.txt	Merge remote-tracking branch 'hifi/master' into merge-hifi-master	2020-04-09 16:46:27 +12:00
interface.entitlements
interface.exe.manifest