cpw.malu.xmpp.jingle_ft: 883f438b: propagate from branch 'im.pidgin.pidgin'...

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 883f438b80edeba99c90cd9e50740ca8b711bc57
Ancestor: cb46b045aa6e927a3814d9053c2b1c0f08d6fa62
Ancestor: eace3f651400230411b3c4477bd07a5ea9038fd7
Author: malu at pidgin.im
Date: 2009-09-09T20:58:23
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/883f438b80edeba99c90cd9e50740ca8b711bc57

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 libpurple/tests/test_qq.c
Modified files:
        ChangeLog ChangeLog.API ChangeLog.win32 Makefile.am NEWS
        autogen.sh configure.ac libpurple/account.c
        libpurple/account.h libpurple/blist.c
        libpurple/certificate.c libpurple/core.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        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/jutil.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_jabber_jutil.c libpurple/tests/tests.h
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkimhtmltoolbar.c
        pidgin/gtkmain.c pidgin/gtkprefs.c pidgin/gtksmiley.c
        pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/plugins/gevolution/eds-utils.c pidgin.spec.in
        po/ChangeLog po/af.po po/am.po po/ar.po po/az.po
        po/be at latin.po po/bg.po po/bn.po po/bs.po po/ca.po
        po/ca at valencia.po po/check_po.pl po/cs.po po/da.po po/de.po
        po/dz.po po/el.po po/en_AU.po po/en_CA.po po/en_GB.po
        po/eo.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po
        po/fr.po po/ga.po po/gl.po po/gu.po po/he.po po/hi.po
        po/hu.po po/hy.po po/id.po po/it.po po/ja.po po/ka.po
        po/km.po po/kn.po po/ko.po po/ku.po po/lo.po po/lt.po
        po/mk.po po/mn.po po/my_MM.po po/nb.po po/ne.po po/nl.po
        po/nn.po po/oc.po po/pa.po po/pl.po po/ps.po po/pt.po
        po/pt_BR.po po/ro.po po/ru.po po/si.po po/sk.po po/sl.po
        po/sq.po po/sr.po po/sr at latin.po po/sv.po po/sw.po po/ta.po
        po/te.po po/th.po po/tr.po po/uk.po po/ur.po po/vi.po
        po/xh.po po/zh_CN.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head cb46b045aa6e927a3814d9053c2b1c0f08d6fa62)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head eace3f651400230411b3c4477bd07a5ea9038fd7)