summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default/textures/icons
diff options
context:
space:
mode:
authorAndrey Lihatskiy <alihatskiy@productengine.com>2024-03-01 18:28:07 +0200
committerGitHub <noreply@github.com>2024-03-01 18:28:07 +0200
commit43049bcff497df650c25897d640de9f038d87254 (patch)
treec19376fa42061e5eee4e55d55cb8cb0a48e26fda /indra/newview/skins/default/textures/icons
parent9f0faf5c892bba9703c713a29202a8ac48bfdf8b (diff)
parentfaf69f407fa95d9dc19f6d737f606e18ab32d052 (diff)
Merge pull request #916 from secondlife/marchcat/yz-merge
emoji release -> maint yz merge
Diffstat (limited to 'indra/newview/skins/default/textures/icons')
-rw-r--r--indra/newview/skins/default/textures/icons/emoji_picker_icon.pngbin0 -> 921 bytes
1 files changed, 0 insertions, 0 deletions
diff --git a/indra/newview/skins/default/textures/icons/emoji_picker_icon.png b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png
new file mode 100644
index 0000000000..ad4f3fa63c
--- /dev/null
+++ b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png
Binary files differ