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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 0fce199585c13c654cabc6416417058bafd20bd7
Ancestor: ae2962f019013296b87740e608de5db314b90d8a
Ancestor: e32779569b0f3d04fbf192de276fec9f01d4f615
Author: malu at pidgin.im
Date: 2009-04-29T05:37:38
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/0fce199585c13c654cabc6416417058bafd20bd7

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/caps.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head ae2962f019013296b87740e608de5db314b90d8a)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head e32779569b0f3d04fbf192de276fec9f01d4f615)