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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: cc37a004c31419ee24d9f534499ccbd94776e2f1
Ancestor: 8c322571bfb4f2d00c9126e59746445f877be296
Ancestor: b717c8977f9b6c88b338cf20f9b0cbf0898d2de3
Author: malu at pidgin.im
Date: 2009-11-03T18:26:19
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/cc37a004c31419ee24d9f534499ccbd94776e2f1

Added files:
        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 autogen.sh finch/libgnt/gntentry.c
        finch/libgnt/gnttextview.c libpurple/dnsquery.c
        libpurple/dnssrv.c libpurple/plugins/perl/Makefile.mingw
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/silc/Makefile.mingw
        libpurple/protocols/silc10/Makefile.mingw
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_filexfer.h
        libpurple/win32/global.mak pidgin/Makefile.mingw
        pidgin/gtkmain.c pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/gtkstatusbox.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/plugins/win32/winprefs/Makefile.mingw

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 8c322571bfb4f2d00c9126e59746445f877be296)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head b717c8977f9b6c88b338cf20f9b0cbf0898d2de3)