# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1180117775 0
# Node ID 0eca6ad5619a031054d7bad59df9db9b41008658
# Parent  67f24cbfb76f36512638c33e88b18430329f227c# Parent  0b0b2a86c37996c89babeb0b16374b96e6ed57b4
merge of '1493925db036ee98f0fdb0209bff9f97ffd913f1'
     and '9386871087930edc97b08cd7badc8fd5b3255285'

diff -r 0b0b2a86c379 -r 0eca6ad5619a .mtn-ignore
diff -r 0b0b2a86c379 -r 0eca6ad5619a libpurple/protocols/gg/lib/pubdir50.c
diff -r 0b0b2a86c379 -r 0eca6ad5619a libpurple/protocols/jabber/message.c
--- a/libpurple/protocols/jabber/message.c	Fri May 25 18:19:28 2007 +0000
+++ b/libpurple/protocols/jabber/message.c	Fri May 25 18:29:35 2007 +0000
@@ -544,7 +544,6 @@
 	char *buf;
 	char *xhtml;
 	char *resource;
-	char *c;
 
 	if(!who || !msg)
 		return 0;
diff -r 0b0b2a86c379 -r 0eca6ad5619a pidgin/gtkimhtmltoolbar.c
diff -r 0b0b2a86c379 -r 0eca6ad5619a pidgin/pixmaps/toolbar/16/Makefile.am
diff -r 0b0b2a86c379 -r 0eca6ad5619a pidgin/pixmaps/toolbar/16/scalable/Makefile.am