# HG changeset patch
# User Mark Doliner <mark@kingant.net>
# Date 1178178512 0
# Node ID 9410f6c2c542a404db61e2bc78dbebba0326553c
# Parent  358fade1205e0c2a3cab6cd20e38f0048ad04202# Parent  3205cc84ce54e5e33d66af9ab5be810ce2ccea97
merge of '45d1b5cb6bcf0cce3082b5b48045a5b708ed27d5'
     and 'e3290844f738f1d63f421385f00eb7e013344e70'

diff -r 3205cc84ce54 -r 9410f6c2c542 pidgin/pixmaps/emotes/default/22/theme
--- a/pidgin/pixmaps/emotes/default/22/theme	Thu May 03 07:43:27 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Thu May 03 07:48:32 2007 +0000
@@ -64,7 +64,7 @@
 msn.png             (M)     (m)
 cat.png             (@)
 dog.png             (&)
-moon.png            (S)     (s)
+moon.png            (S)
 star.png            (*)
 film.png            (~)
 musical-note.png    (8)
@@ -88,7 +88,7 @@
 good.png            (Y)     (y)
 bad.png             (N)     (n)
 vampire.png         :[      :-[
-#goat.png           (nah)  (NAH)
+#goat.png           (nah)
 sun.png             (#)
 rainbow.png         (R)     (r)
 quiet.png           :-#
@@ -97,26 +97,26 @@
 sarcastic.png       ^o)
 secret.png          :-*
 sick.png            +o(
-snail.png           (sn)    (SN)
-turtle.png          (tu)    (TU)
-plate.png           (pl)    (PL)
+snail.png           (sn)
+turtle.png          (tu)
+plate.png           (pl)
 bowl.png            (||)
-pizza.png           (pi)    (PI)
-soccerball.png      (so)    (SO)
-car.png             (au)    (AU)
-airplane.png        (ap)    (AP)
-umbrella.png        (um)    (UM)
-island.png          (ip)    (IP)
-computer.png        (co)    (CO)
-mobile.png          (mp)    (MP)
-brb.png             (brb)   (BRB)
-rain.png            (st)    (ST)
-highfive.png        (h5)    (H5)
-coins.png           (mo)    (MO)
-sheep.png           (bah)   (BAH)
+pizza.png           (pi)
+soccerball.png      (so)
+car.png             (au)
+airplane.png        (ap)
+umbrella.png        (um)
+island.png          (ip)
+computer.png        (co)
+mobile.png          (mp)
+brb.png             (brb)
+rain.png            (st)
+highfive.png        (h5)
+coins.png           (mo)
+sheep.png           (bah)
 dont-know.png       :^)
 thinking.png        *-)
-thunder.png         (li)    (LI)
+thunder.png         (li)
 party.png           <:o)
 eyeroll.png         8-)
 yawn.png            |-)