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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: c4f7127dd8e10256b403364f3950e5302757aa54
Ancestor: 66c343e57ba5828a78d88d159a594e3c4131e50e
Ancestor: 775a9f847e8c3801a2f384bbdf89183db8dfd659
Author: malu at pidgin.im
Date: 2010-06-06T18:19:30
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/c4f7127dd8e10256b403364f3950e5302757aa54

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/socks5.c
        libpurple/protocols/jabber/socks5.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h
Modified files:
        Makefile.am Makefile.mingw libpurple/ft.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/user.h libpurple/util.c
        pidgin/Makefile.mingw pidgin/gtkconv.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 66c343e57ba5828a78d88d159a594e3c4131e50e)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 775a9f847e8c3801a2f384bbdf89183db8dfd659)