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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 83261fe23f1db5843b5b4df8b8c1771d7fba8707
Ancestor: 39c43c2879bd386b772e010eb23b15f7ed9307c2
Ancestor: acf4cce929cd032affb8793d84b0506d8867e04c
Author: malu at pidgin.im
Date: 2009-08-12T12:50:26
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/83261fe23f1db5843b5b4df8b8c1771d7fba8707

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/ft.c libpurple/ft.h libpurple/media.c
        libpurple/mediamanager.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/chat.c
        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 acf4cce929cd032affb8793d84b0506d8867e04c)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 39c43c2879bd386b772e010eb23b15f7ed9307c2)