# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1176701864 0
# Node ID 6ded371da50f95bbae12cf714edfe1de7eae17c4
# Parent  93f1801d4cc6fc5b4a2fed4f1f0a52f5da5ee99d# Parent  220c11da554c691db91e81270d810e9732f815ad
merge of '208954788ae2550f1dbc241cbca23eb02991dc5a'
     and 'a842e5eb826e08ac7e5b8a2e6c8f0ad46720afe0'

diff -r 220c11da554c -r 6ded371da50f .mtn-ignore
--- a/.mtn-ignore	Mon Apr 16 05:34:42 2007 +0000
+++ b/.mtn-ignore	Mon Apr 16 05:37:44 2007 +0000
@@ -49,6 +49,7 @@
 libpurple/purple-client-bindings.c
 libpurple/purple-client-bindings.h
 libpurple/purple-client-example
+libpurple/tests/check_libpurple
 libpurple/win32/libpurplerc.rc$
 libtool
 local.mak
@@ -59,6 +60,7 @@
 po/POTFILES$
 po/missing
 po/notexist
+po/pidgin.pot
 po/stamp-it
 stamp-h1
 win32-install-dir(\.release)?
diff -r 220c11da554c -r 6ded371da50f pidgin/plugins/Makefile.am