# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1226823877 0
# Node ID ef7e87ada472c832bf93a77000f0741852c85121
# Parent  91ad492e58a68d9c8c01c9d644082f6ea5ee5a9b# Parent  72932bd805f122a70bd5d0b06f10d44f6353cd0d
propagate from branch 'im.pidgin.pidgin' (head f5e2281f83ea70415eec2139f383dd25f27a0ec1)
            to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head e8b2e1e7ac4597ec67db53c64064e2e8e7f3cbc1)

diff -r 91ad492e58a6 -r ef7e87ada472 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 91ad492e58a6 -r ef7e87ada472 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 \