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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 461f111b18f438eebe36dc8e07976ebe321a04d6
Ancestor: 31b57ac939dc22eb4a3d54e7c03378ed10d93561
Ancestor: 5ab68ddb0251205f7ef97f4c280e65696cbd5ff2
Author: malu at pidgin.im
Date: 2009-04-07T08:10:08
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/461f111b18f438eebe36dc8e07976ebe321a04d6

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:
        libpurple/ft.c libpurple/internal.h libpurple/mime.c
        libpurple/mime.h libpurple/plugin.h
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/zephyr/ZVariables.c
        libpurple/protocols/zephyr/zephyr.c libpurple/server.c
        pidgin/eggtrayicon.h pidgin/gtkcellrendererexpander.c
        pidgin/gtkcellrendererexpander.h
        pidgin/gtkcellrendererprogress.h pidgin/gtkdnd-hints.h
        pidgin/gtkimhtml.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.h pidgin/gtkmenutray.c
        pidgin/gtkmenutray.h pidgin/gtksourceiter.h
        pidgin/gtksourceundomanager.h pidgin/gtkstatusbox.h
        pidgin/minidialog.c pidgin/minidialog.h pidgin/pidginstock.h
        pidgin/plugins/ticker/gtkticker.h

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 5ab68ddb0251205f7ef97f4c280e65696cbd5ff2)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 31b57ac939dc22eb4a3d54e7c03378ed10d93561)