diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-04 18:01:05 +0200 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2024-03-04 18:01:05 +0200 |
| commit | b68a05e7c30930976ed1273b4c7a0fec01d2a84f (patch) | |
| tree | 03ababecc49376c0e607b3548d9beb596f79c3a7 /indra/newview/skins/default/textures/icons | |
| parent | d47c6536820d1ed6e373147678dd0fab90e80ab8 (diff) | |
| parent | 701d1a33bb8227aa55a71f48caeb30a453e77ee0 (diff) | |
Merge branch 'main' into marchcat/x-merge
# Conflicts:
# indra/llcommon/llstring.cpp
# indra/llcommon/llstring.h
Diffstat (limited to 'indra/newview/skins/default/textures/icons')
| -rw-r--r-- | indra/newview/skins/default/textures/icons/emoji_picker_icon.png | bin | 0 -> 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 Binary files differnew file mode 100644 index 0000000000..ad4f3fa63c --- /dev/null +++ b/indra/newview/skins/default/textures/icons/emoji_picker_icon.png |
