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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 7d278213089d7bd61b8639bd2947b9d2820b048e
Ancestor: 7d957f33e8848d9df36c84cca82c34c98f6baf5e
Ancestor: 949dfbf7d6f0a81ff018be4f61c5034962e26ff7
Author: malu at pidgin.im
Date: 2009-05-06T21:09:00
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/7d278213089d7bd61b8639bd2947b9d2820b048e

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 ChangeLog.API libpurple/blist.c
        libpurple/buddyicon.c libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.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/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/null/nullprpl.c pidgin/gtkimhtml.c
        pidgin/gtkimhtml.h pidgin/gtkstatusbox.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 7d957f33e8848d9df36c84cca82c34c98f6baf5e)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 949dfbf7d6f0a81ff018be4f61c5034962e26ff7)