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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 42dee37182f27e15715511311b5ea6344a884a07
Ancestor: 001baf5a55cf8ce2f642463c36cc79d93decb714
Ancestor: c1a0e7e813b5e2543e7f5b4e9421995a0d51022a
Author: malu at pidgin.im
Date: 2010-06-01T20:14:27
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/42dee37182f27e15715511311b5ea6344a884a07

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:
        ChangeLog ChangeLog.API NEWS configure.ac 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/slplink.c libpurple/upnp.c
        po/ChangeLog po/POTFILES.in po/cs.po po/de.po po/he.po
        po/it.po po/nn.po po/pl.po po/sl.po po/uk.po po/zh_HK.po
        po/zh_TW.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 001baf5a55cf8ce2f642463c36cc79d93decb714)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head c1a0e7e813b5e2543e7f5b4e9421995a0d51022a)