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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 665c9dc6b4373984c459da460368975fc7dd2386
Ancestor: 42dee37182f27e15715511311b5ea6344a884a07
Ancestor: a16b83242562658cc9f08739aedaa0a4b621077a
Author: malu at pidgin.im
Date: 2010-06-02T21:05:16
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/665c9dc6b4373984c459da460368975fc7dd2386

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 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/notification.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c pidgin.spec.in po/af.po
        po/am.po po/ar.po po/az.po po/be at latin.po po/bg.po po/bn.po
        po/bn_IN.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/mr.po po/ms_MY.po po/my_MM.po
        po/nb.po po/ne.po po/nl.po po/nn.po po/oc.po po/or.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 a16b83242562658cc9f08739aedaa0a4b621077a)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 42dee37182f27e15715511311b5ea6344a884a07)