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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 467aa8f56a09095d5a454b1e94a4b4639addaadf
Ancestor: 7e9a2d695d306037e07cd5644ea5c5cbc14dca3d
Ancestor: 84e0c74617c4b08ace10929291671ce130caa03d
Author: malu at pidgin.im
Date: 2009-10-05T19:31:03
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/467aa8f56a09095d5a454b1e94a4b4639addaadf

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:
        AUTHORS ChangeLog doc/pidgin.1.in finch/libgnt/gntcolors.c
        finch/plugins/gnttinyurl.c libpurple/blist.c
        libpurple/dnsquery.h libpurple/dnssrv.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        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/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c pidgin/gtkconv.c
        pidgin/gtkdialogs.c
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/xmppconsole.c po/ChangeLog po/vi.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 7e9a2d695d306037e07cd5644ea5c5cbc14dca3d)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 84e0c74617c4b08ace10929291671ce130caa03d)