1
0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00

Merge pull request #4480

Andrew (anoa) (1):
      fix(emojis): Add text variants for the blush emoji
This commit is contained in:
sudden6 2017-06-21 15:14:01 +02:00
commit 67d2041684
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
4 changed files with 11 additions and 3 deletions

View File

@ -170,6 +170,8 @@
</emoticon>
<emoticon file="../Universe/1f633">
<string>😳</string>
<string>:$</string>
<string>:blush:</string>
</emoticon>
<emoticon file="../Universe/1f634">
<string>😴</string>
@ -2528,4 +2530,4 @@
<string>🇺🇸</string>
</emoticon>
</messaging-emoticon-map>
</messaging-emoticon-map>

View File

@ -170,11 +170,13 @@
</emoticon>
<emoticon file="../emojione/1f633">
<string>😳</string>
<string>:$</string>
<string>:blush:</string>
</emoticon>
<emoticon file="../emojione/1f634">
<string>😴</string>
<string>:sleep:</string>
<string>:sleeping:</string>
<string>:sleep:</string>
<string>:sleeping:</string>
</emoticon>
<emoticon file="../emojione/1f635">
<string>😵</string>

View File

@ -213,6 +213,8 @@
</emoticon>
<emoticon file="1f633">
<string>😳</string>
<string>:$</string>
<string>:blush:</string>
</emoticon>
<emoticon file="1f634">
<string>😴</string>

View File

@ -213,6 +213,8 @@
</emoticon>
<emoticon file="1f633">
<string>😳</string>
<string>:$</string>
<string>:blush:</string>
</emoticon>
<emoticon file="1f634">
<string>😴</string>