Mercurial > repos > other > linux
changeset 43:6ea4cdc0c783
Merge accidental head
| author | IBBoard <dev@ibboard.co.uk> |
|---|---|
| date | Mon, 20 Mar 2017 21:08:32 +0000 |
| parents | 7af4ce187680 (current diff) 767cffc0558f (diff) |
| children | 3680ddae8df8 |
| files | |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/XCompose Mon Mar 20 21:07:16 2017 +0000 +++ b/XCompose Mon Mar 20 21:08:32 2017 +0000 @@ -24,8 +24,8 @@ <Multi_key> <o> <underscore> <O> : "😲" #ASTONISHED FACE <Multi_key> <8> <parenleft> : "😨" #FEARFUL FACE (big scared eyes and frown) <Multi_key> <D> <colon> : "😨" #FEARFUL FACE -<Multi_key> <8> <backslash> : "😒" #UNAMUSED FACE (like CONFUSED FACE but for worse situations) -<Multi_key> <8> <bar> : "🙄" # FACE WITH ROLLING EYES +<Multi_key> <8> <bar> : "😒" #UNAMUSED FACE ((Stunned look at what was said) +<Multi_key> <8> <backslash> : "🙄" # FACE WITH ROLLING EYES <Multi_key> <less> <greater> : "😆" #Smiling Face With Open Mouth and Tightly-Closed Eyes (laughing but without tears) <Multi_key> <colon> <l> <o> <l> <colon> : "😆" #Smiling Face With Open Mouth and Tightly-Closed Eyes (laughing but without tears) <Multi_key> <colon> <x> : "😙" #Kissing face - with smiling eyes, so it looks less like duckface!