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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 39c43c2879bd386b772e010eb23b15f7ed9307c2
Ancestor: 3cbb10bfb6f52d9668fe6213a57e701bfcff6d68
Ancestor: 6d384789f5b5a1d6cf59cd53e8f3021ab8c2a79e
Author: malu at pidgin.im
Date: 2009-08-12T05:07:09
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/39c43c2879bd386b772e010eb23b15f7ed9307c2

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.API libpurple/ft.c libpurple/ft.h
        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

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 6d384789f5b5a1d6cf59cd53e8f3021ab8c2a79e)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 3cbb10bfb6f52d9668fe6213a57e701bfcff6d68)