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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: b0e56d119311a9446e2e96003d3a353ddb419fc4
Ancestor: 6a1339c2294c5978705f7d4d5f259506da5d230d
Ancestor: 9ba255f7af2e689ca7a409b0978bc324f31068bd
Author: malu at pidgin.im
Date: 2009-04-29T08:38:59
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/b0e56d119311a9446e2e96003d3a353ddb419fc4

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:
        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/presence.c
        libpurple/protocols/jabber/si.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 9ba255f7af2e689ca7a409b0978bc324f31068bd)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 6a1339c2294c5978705f7d4d5f259506da5d230d)