Mercurial > pidgin
changeset 16170:8150347691d2
merge of '346cf9389391965a41f873cb9e225e49cb51362e'
and 'd040c1bd0b5615cf14d057dc62db2c1e20aaa41e'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 15 Apr 2007 22:32:23 +0000 |
parents | 2663150c0a9f (current diff) 43f3194780a1 (diff) |
children | 3e400c5b0b51 |
files | |
diffstat | 2 files changed, 1 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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 \
--- 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