merge of '411e130ef324d7cfff5a65106007852b8287cef5'

Sun, 15 Apr 2007 23:53:36 +0000

author
Sadrul Habib Chowdhury <sadrul@pidgin.im>
date
Sun, 15 Apr 2007 23:53:36 +0000
changeset 16228
ce05821cf7bc
parent 16223
411e130ef324 (current diff)
parent 16227
e9f5fc3f517f (diff)
child 16229
1c8035d3c9ca

merge of '411e130ef324d7cfff5a65106007852b8287cef5'
and 'e9f5fc3f517f5b30f6593e223fad1537855af49f'

--- a/pidgin/plugins/Makefile.am	Sun Apr 15 23:45:52 2007 +0000
+++ b/pidgin/plugins/Makefile.am	Sun Apr 15 23:53:36 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 \
--- a/po/POTFILES.in	Sun Apr 15 23:45:52 2007 +0000
+++ b/po/POTFILES.in	Sun Apr 15 23:53:36 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

mercurial