# HG changeset patch
# User Richard Laager <rlaager@wiktel.com>
# Date 1176676343 0
# Node ID 8150347691d247856fd677e6b9ac9f449580e9ac
# Parent  2663150c0a9fe411753619426928fad61e369c27# Parent  43f3194780a1464d117c810a2d15c6fc0d1e807d
merge of '346cf9389391965a41f873cb9e225e49cb51362e'
     and 'd040c1bd0b5615cf14d057dc62db2c1e20aaa41e'

diff -r 2663150c0a9f -r 8150347691d2 pidgin/plugins/Makefile.am
--- a/pidgin/plugins/Makefile.am	Sun Apr 15 20:00:30 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Sun Apr 15 22:32:23 2007 +0000
@@ -86,9 +86,9 @@
 EXTRA_DIST = \
 	Makefile.mingw \
 	contact_priority.c \
-	gaiminc.c \
 	gtk-signals-test.c \
 	mailchk.c \
+	pidgininc.c \
 	raw.c \
 	win32/transparency/Makefile.mingw \
 	win32/transparency/win2ktrans.c \
diff -r 2663150c0a9f -r 8150347691d2 po/POTFILES.in
--- a/po/POTFILES.in	Sun Apr 15 20:00:30 2007 +0000
+++ b/po/POTFILES.in	Sun Apr 15 22:32:23 2007 +0000
@@ -43,7 +43,6 @@
 libpurple/log.c
 libpurple/plugin.c
 libpurple/plugins/autoaccept.c
-libpurple/plugins/autoreply.c
 libpurple/plugins/buddynote.c
 libpurple/plugins/ciphertest.c
 libpurple/plugins/dbus-example.c