# HG changeset patch
# User Eric Polino <aluink@pidgin.im>
# Date 1179758565 0
# Node ID 0598803f9b6494ef2dba1a2dcb147eba9cc1a7d9
# Parent  c5ca1d9b67fad131357faa901b2d041cf7e76ee2# Parent  ddf759c28d0b349a1dc0a0ac6ff5946e8f1f8be1
merge of '34ad536ba137d9ad9af8f55629835e501c9ba5f4'
     and 'b917cc2cf9c46c7163ad3345b312dac1eea896cf'

diff -r ddf759c28d0b -r 0598803f9b64 .mtn-ignore
--- a/.mtn-ignore	Sun May 20 18:32:40 2007 +0000
+++ b/.mtn-ignore	Mon May 21 14:42:45 2007 +0000
@@ -66,3 +66,4 @@
 stamp-h1
 win32-install-dir(\.release)?
 VERSION$
+\.hg.*
diff -r ddf759c28d0b -r 0598803f9b64 libpurple/protocols/gg/lib/pubdir50.c
diff -r ddf759c28d0b -r 0598803f9b64 libpurple/protocols/jabber/auth.c
diff -r ddf759c28d0b -r 0598803f9b64 pidgin/gtksound.c