# HG changeset patch
# User Richard Laager <rlaager@pidgin.im>
# Date 1226823877 0
# Node ID f4e3febbd86c91bc6cf957bf072518feb7bff2c2
# Parent  4d5e866e1bc93de56b5a87aa62efc158762a4750# Parent  656fe31fc1760799973139384ead920845700920
propagate from branch 'im.pidgin.pidgin' (head 656fe31fc1760799973139384ead920845700920)
            to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 4d5e866e1bc93de56b5a87aa62efc158762a4750)

diff -r 4d5e866e1bc9 -r f4e3febbd86c pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Sun Nov 16 08:22:46 2008 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sun Nov 16 08:24:37 2008 +0000
@@ -213,6 +213,7 @@
 		emotes/default/24/scalable/musical-note.svg \
 		emotes/default/24/scalable/peace.svg \
 		emotes/default/24/scalable/phone.svg \
+		emotes/default/24/scalable/pidgin-emotes.svg \
 		emotes/default/24/scalable/pig.svg \
 		emotes/default/24/scalable/pill.svg \
 		emotes/default/24/scalable/pizza.svg \
diff -r 4d5e866e1bc9 -r f4e3febbd86c pidgin/pixmaps/emotes/default/24/Makefile.am
--- a/pidgin/pixmaps/emotes/default/24/Makefile.am	Sun Nov 16 08:22:46 2008 +0000
+++ b/pidgin/pixmaps/emotes/default/24/Makefile.am	Sun Nov 16 08:24:37 2008 +0000
@@ -1,4 +1,5 @@
-SMILEYS = 	act-up.png \
+SMILEYS = \
+    act-up.png \
     airplane.png \
     alien.png \
     angel.png \