From 5a5506fed918b6d1a041a040b2060ed25e40d464 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Thu, 29 Oct 2009 18:35:06 +0000
Subject: svn merge ^/branches/released

---
 libX11/nls/en_US.UTF-8/Compose.pre | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libX11/nls')

diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre
index 1edfdebb9..044cae1b0 100644
--- a/libX11/nls/en_US.UTF-8/Compose.pre
+++ b/libX11/nls/en_US.UTF-8/Compose.pre
@@ -218,6 +218,9 @@ XCOMM Other symbols
 <Multi_key> <C> <C> <C> <P>             : "☭"   U262D # HAMMER AND SICKLE
 <Multi_key> <less> <3>                  : "♥"   U2665 # BLACK HEART SUIT
 
+<Multi_key> <colon> <parenright>        : "☺"   U263A # WHITE SMILING FACE
+<Multi_key> <colon> <parenleft>         : "☹"   U2639 # WHITE FROWNING FACE
+
 XCOMM Part 2
 
 XCOMM Compose map for Korean Hangul(Choseongul) Conjoining Jamos  automatically
-- 
cgit v1.2.3