Mercurial > pidgin
changeset 17631:91e92cb0d875
merge of '2f42a51df657abf14f7aec137ddd8ff2ab0038d8'
and '84bbce8fcad4046fe353752063a4cc575e0d25e6'
| author | Luke Schierer <lschiere@pidgin.im> |
|---|---|
| date | Thu, 14 Jun 2007 16:17:07 +0000 |
| parents | dc195d5646e9 (diff) 657dccbf8020 (current diff) |
| children | 36ebcb33e2eb |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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 \
--- 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"