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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: caf5feee2bbe81d86e427174a991faa5baa2f323
Ancestor: 71b2a5cff40ba5a648b73ff9b62b88ec21bce828
Ancestor: d2984fa9ffdaa63b01cc1e0d94aec5622cd080c1
Author: malu at pidgin.im
Date: 2009-11-17T20:05:52
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/caf5feee2bbe81d86e427174a991faa5baa2f323

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:
        ChangeLog libpurple/media.c
        libpurple/protocols/Makefile.mingw
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.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/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/splashscreen.c libpurple/server.c
        pidgin/gtkconv.c pidgin/gtkprefs.c pidgin/gtkutils.c
        pidgin/plugins/pidginrc.c
        pidgin/win32/nsis/pidgin-installer.nsi 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/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 d2984fa9ffdaa63b01cc1e0d94aec5622cd080c1)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 71b2a5cff40ba5a648b73ff9b62b88ec21bce828)