cpw.malu.xmpp.jingle_ft: 83fd1df4: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 83fd1df46d24e73ea9732db36e1e10693160bc99
Ancestor: 140d7640af14c88fbd79c73548a8cf89067e6542
Ancestor: b8f492180651b61175e947f75144c809fafc1c25
Author: malu at pidgin.im
Date: 2010-06-20T20:53:46
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/83fd1df46d24e73ea9732db36e1e10693160bc99

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 doc/finch.1.in finch/libgnt/gntbox.c
        finch/libgnt/gntcombobox.c finch/libgnt/gntentry.c
        libpurple/account.c libpurple/ft.c
        libpurple/media/backend-fs2.c
        libpurple/protocols/gg/lib/resolver.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth_cyrus.c
        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/rtp.c
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/yahoo/libyahoo.c
        libpurple/protocols/yahoo/libyahoojp.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/tests/test_jabber_scram.c
        libpurple/tests/test_util.c libpurple/util.c
        pidgin/gtkblist.c pidgin/gtkimhtmltoolbar.c po/sv.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 140d7640af14c88fbd79c73548a8cf89067e6542)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head b8f492180651b61175e947f75144c809fafc1c25)