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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 466f6483668f02023cfb524c2b65eb9df9639576
Ancestor: 107e704a6ea54af028832ea8a416128b4fcf206e
Ancestor: 82175cfc320b7c831512ecc2a00beec2a86b7a2a
Author: malu at pidgin.im
Date: 2010-05-05T20:21:38
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/466f6483668f02023cfb524c2b65eb9df9639576

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:
        COPYRIGHT ChangeLog ChangeLog.API doc/blist-signals.dox
        doc/connection-signals.dox doc/conversation-signals.dox
        doc/gtkimhtml-signals.dox finch/gntblist.c
        libpurple/account.c libpurple/account.h libpurple/ft.c
        libpurple/ft.h libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/gg/gg.c libpurple/protocols/gg/search.c
        libpurple/protocols/irc/irc.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth.h
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/auth_digest_md5.c
        libpurple/protocols/jabber/auth_plain.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        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/message.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/novell/novell.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq.c libpurple/protocols/silc/silc.c
        libpurple/protocols/silc10/silc.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/prpl.h libpurple/request.c libpurple/request.h
        libpurple/tests/test_util.c libpurple/util.c pidgin/gtkft.c
        pidgin/gtkrequest.c pidgin/gtkutils.c
        pidgin/plugins/timestamp_format.c po/ca.po po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 82175cfc320b7c831512ecc2a00beec2a86b7a2a)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 107e704a6ea54af028832ea8a416128b4fcf206e)