# HG changeset patch
# User Luke Schierer <lschiere@pidgin.im>
# Date 1181837827 0
# Node ID 91e92cb0d8750b60d9d87cdf373194597e6effd9
# Parent  dc195d5646e9d2ba52f1e714b3c80ed4613b421c# Parent  657dccbf8020f012ff572e835db9669028f8e880
merge of '2f42a51df657abf14f7aec137ddd8ff2ab0038d8'
     and '84bbce8fcad4046fe353752063a4cc575e0d25e6'

diff -r 657dccbf8020 -r 91e92cb0d875 libpurple/plugins/Makefile.mingw
--- a/libpurple/plugins/Makefile.mingw	Thu Jun 14 16:14:38 2007 +0000
+++ b/libpurple/plugins/Makefile.mingw	Thu Jun 14 16:17:07 2007 +0000
@@ -63,6 +63,7 @@
 		autoaccept.dll \
 		buddynote.dll \
 		idle.dll \
+		joinpart.dll \
 		log_reader.dll \
 		newline.dll \
 		offlinemsg.dll \
diff -r 657dccbf8020 -r 91e92cb0d875 pidgin/win32/nsis/pidgin-installer.nsi
--- a/pidgin/win32/nsis/pidgin-installer.nsi	Thu Jun 14 16:14:38 2007 +0000
+++ b/pidgin/win32/nsis/pidgin-installer.nsi	Thu Jun 14 16:17:07 2007 +0000
@@ -697,6 +697,7 @@
     Delete "$INSTDIR\plugins\history.dll"
     Delete "$INSTDIR\plugins\iconaway.dll"
     Delete "$INSTDIR\plugins\idle.dll"
+    Delete "$INSTDIR\plugins\joinpart.dll"
     Delete "$INSTDIR\plugins\libaim.dll"
     Delete "$INSTDIR\plugins\libbonjour.dll"
     Delete "$INSTDIR\plugins\libgg.dll"