cpw.malu.xmpp.jingle_ft: 4d90489a: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 4d90489aa13e9e9e18adca1d89d457730fff6b3a
Ancestor: 388ed2b5ef003924356c4896e64cb779a1d5c1b3
Ancestor: 96b27a20c7250b87761a8bd4f5540bf1fa32b6f4
Author: malu at pidgin.im
Date: 2010-03-09T21:41:31
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/4d90489aa13e9e9e18adca1d89d457730fff6b3a

Added files:
        libpurple/protocols/gg/lib/dcc7.c
        libpurple/protocols/gg/lib/libgadu-internal.h
        libpurple/protocols/gg/lib/protocol.h
        libpurple/protocols/gg/lib/resolver.c
        libpurple/protocols/gg/lib/resolver.h
        libpurple/protocols/gg/lib/sha1.c
        libpurple/protocols/jabber/jingle/file-transfer.c
        libpurple/protocols/jabber/jingle/file-transfer.h
        libpurple/protocols/jabber/jingle/ibbs.c
        libpurple/protocols/jabber/jingle/ibbs.h
        libpurple/protocols/jabber/jingle/s5b.c
        libpurple/protocols/jabber/jingle/s5b.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h
Modified files:
        ChangeLog ChangeLog.win32 Makefile.mingw configure.ac
        libpurple/connection.h libpurple/ft.c
        libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl-handlers.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/Makefile.mingw
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/compat.h
        libpurple/protocols/gg/lib/dcc.c
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/http.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/gg/lib/obsolete.c
        libpurple/protocols/gg/lib/pubdir.c
        libpurple/protocols/gg/lib/pubdir50.c
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usermood.h
        libpurple/protocols/oscar/oscar.c libpurple/signals.c
        libpurple/signals.h libpurple/upnp.c
        libpurple/win32/global.mak pidgin/Makefile.mingw
        pidgin/gtkblist.c pidgin/win32/gtkdocklet-win32.c
        pidgin/win32/nsis/available.lst
        pidgin/win32/nsis/generate_gtk_zip.sh
        pidgin/win32/nsis/langmacros.nsh
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/afrikaans.nsh
        pidgin/win32/nsis/translations/arabic.nsh
        pidgin/win32/nsis/translations/basque.nsh
        pidgin/win32/nsis/translations/catalan.nsh
        pidgin/win32/nsis/translations/dutch.nsh
        pidgin/win32/nsis/translations/english.nsh
        pidgin/win32/nsis/translations/finnish.nsh
        pidgin/win32/nsis/translations/french.nsh
        pidgin/win32/nsis/translations/german.nsh
        pidgin/win32/nsis/translations/hebrew.nsh
        pidgin/win32/nsis/translations/hungarian.nsh
        pidgin/win32/nsis/translations/italian.nsh
        pidgin/win32/nsis/translations/japanese.nsh
        pidgin/win32/nsis/translations/kurdish.nsh
        pidgin/win32/nsis/translations/lithuanian.nsh
        pidgin/win32/nsis/translations/norwegian.nsh
        pidgin/win32/nsis/translations/persian.nsh
        pidgin/win32/nsis/translations/portuguese-br.nsh
        pidgin/win32/nsis/translations/simp-chinese.nsh
        pidgin/win32/nsis/translations/slovak.nsh
        pidgin/win32/nsis/translations/slovenian.nsh
        pidgin/win32/nsis/translations/swedish.nsh
        pidgin/win32/nsis/translations/trad-chinese.nsh
        pidgin/win32/nsis/translations/valencian.nsh
        pidgin/win32/winpidgin.c pidgin/win32/wspell.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 96b27a20c7250b87761a8bd4f5540bf1fa32b6f4)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 388ed2b5ef003924356c4896e64cb779a1d5c1b3)