# HG changeset patch
# User Elliott Sales de Andrade <qulogic@pidgin.im>
# Date 1218856370 0
# Node ID 1baf6944111d9c337178b253f7a27f4e33e6e61f
# Parent  f3f925e4e51ad16e52d0bd693d407e7c118ec351# Parent  e8a6ee73f3799d071f1c448de0f792afba376057
merge of '2bf1b91e196b9f481e1e0e63ba6aa28c9918ce6d'
     and '799e3e0da4228c262ac863ee164defcdf7ce5afe'

diff -r f3f925e4e51a -r 1baf6944111d NEWS
--- a/NEWS	Sat Aug 16 02:39:35 2008 +0000
+++ b/NEWS	Sat Aug 16 03:12:50 2008 +0000
@@ -6,10 +6,16 @@
 	it to the world!  There are myriad bugfixes, including some important
 	ones so you should be sure to update.
 
-        Hylke: Finally MSNP15 support. To celebrate this I refreshed a lot of 
-        the smilies used in the protocol and added the long awaited indispensable
-        bunny icon. I think this is one of those releases that will make a lot
-        of users happy, especially MSN users.
+	Hylke: Finally MSNP15 support. To celebrate this I refreshed a lot of 
+	the smilies used in the protocol and added the long awaited indispensable
+	bunny icon. I think this is one of those releases that will make a lot
+	of users happy, especially MSN users.
+
+	Elliott: Oh look, my first NEWS! Well anyway, with that new MSNP15
+	support, this release is set up to be a huge success and a total flop
+	all at the same time. Here's hoping it's the "huge success" one for you.
+	Those icon changes that Hylke made, while minor, really make things look
+	a little cleaner, I think. Oh yea, did I mention that MSNP15 stuff?
 
 2.4.3 (07/01/2008):
 	Richard: This release includes important bug fixes.  I'm just cutting
diff -r f3f925e4e51a -r 1baf6944111d pidgin/pixmaps/Makefile.am
--- a/pidgin/pixmaps/Makefile.am	Sat Aug 16 02:39:35 2008 +0000
+++ b/pidgin/pixmaps/Makefile.am	Sat Aug 16 03:12:50 2008 +0000
@@ -125,6 +125,7 @@
 		emotes/default/24/scalable/car.svg \
 		emotes/default/24/scalable/cat.svg \
 		emotes/default/24/scalable/chicken.svg \
+		emotes/default/24/scalable/cigarette.svg \
 		emotes/default/24/scalable/clap.svg \
 		emotes/default/24/scalable/clock.svg \
 		emotes/default/24/scalable/cloudy.svg \
@@ -246,7 +247,6 @@
 		emotes/default/24/scalable/shut-mouth.svg \
 		emotes/default/24/scalable/sick.svg \
 		emotes/default/24/scalable/sidefrown.svg \
-		emotes/default/24/scalable/cigarette.svg \
 		emotes/default/24/scalable/silly.svg \
 		emotes/default/24/scalable/sinister.svg \
 		emotes/default/24/scalable/skeleton.svg \