Mercurial > pidgin3 / changeset

changeset

propagate from branch 'im.pidgin.pidgin' (head 656fe31fc1760799973139384ead920845700920) cpw.rekkanoryo.icqxstatus

Sun, 16 Nov 2008 08:24:37 +0000

author
Richard Laager <rlaager@pidgin.im>
date
Sun, 16 Nov 2008 08:24:37 +0000
branch
cpw.rekkanoryo.icqxstatus
changeset 24895
f4e3febbd86c
parent 24894
4d5e866e1bc9 (current diff)
parent 24692
656fe31fc176 (diff)
child 24896
84f833bb1b72

propagate from branch 'im.pidgin.pidgin' (head 656fe31fc1760799973139384ead920845700920)
to branch 'im.pidgin.cpw.rekkanoryo.icqxstatus' (head 4d5e866e1bc93de56b5a87aa62efc158762a4750)

pidgin/pixmaps/Makefile.am file | annotate | diff | comparison | revisions 
--- 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 \
--- 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 \

Mercurial Repository: pidgin3

mercurial