changeset 17368:b31f53796f3b

merge of '3d155cfe6d5da449233ba5c19a6f5fea1a33467d' and '85d3a31151de8461340501f24062fb9e2545dd99'
author Richard Laager <rlaager@wiktel.com>
date Tue, 29 May 2007 05:40:45 +0000
parents 837b697723c0 (current diff) 7ada026a53b9 (diff)
children f80f7e1047be 8b322c8afeb6
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin/pixmaps/emotes/default/22/theme	Tue May 29 04:56:30 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/22/theme	Tue May 29 05:40:45 2007 +0000
@@ -90,7 +90,7 @@
 good.png            (Y)     (y)
 bad.png             (N)     (n)
 vampire.png         :[      :-[
-#goat.png           (nah)
+goat.png            (nah)
 sun.png             (#)
 rainbow.png         (R)     (r)
 quiet.png           :-#
@@ -122,7 +122,6 @@
 party.png           <:o)
 eyeroll.png         8-)
 yawn.png            |-) 
-goat.png            (nah)
 ! skywalker.png     C:-)    c:-)    C:)     c:)
 ! monkey.png        :-(|)