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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 6839df975b384e52dec320c66e00dcf7f2c3c813
Ancestor: 0693828b7802c759098b27c6b8f5b8de37bc2d89
Ancestor: 74c00c33cab0e208691543b25eeae7906f6e4181
Author: malu at pidgin.im
Date: 2009-06-22T21:53:21
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/6839df975b384e52dec320c66e00dcf7f2c3c813

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
        pidgin/plugins/disco/Makefile.mingw
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        finch/plugins/gnthistory.c libpurple/connection.c
        libpurple/connection.h libpurple/network.c
        libpurple/network.h libpurple/notify.h
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/bonjour/bonjour_ft.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/gg.c
        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/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/protocols/yahoo/yahoo_picture.c
        libpurple/protocols/yahoo/yahoo_profile.c
        libpurple/protocols/yahoo/yahoochat.c
        libpurple/protocols/yahoo/ycht.c libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/gtkimhtml.c
        pidgin/gtkstatusbox.c pidgin/plugins/Makefile.mingw
        pidgin/plugins/gevolution/gevolution.c
        pidgin/win32/nsis/pidgin-installer.nsi

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 74c00c33cab0e208691543b25eeae7906f6e4181)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 0693828b7802c759098b27c6b8f5b8de37bc2d89)