# HG changeset patch
# User IBBoard <dev@ibboard.co.uk>
# Date 1490044112 0
# Node ID 6ea4cdc0c783ebae82e1817b043c1e77789250da
# Parent  7af4ce1876800ab44a5f8260e6ee1e3f9bf672b0# Parent  767cffc0558f89128309be266c689e02d5261e86
Merge accidental head

diff -r 7af4ce187680 -r 6ea4cdc0c783 XCompose
--- 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!