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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: cb595deac9a6e3dc0213304db09b5e9410dd7616
Ancestor: 2833fd1d337477c5b6efc4247a9e6127580414ea
Ancestor: 73b69273479f1c23e3237343d626c0032425770c
Author: malu at pidgin.im
Date: 2009-04-27T18:21:14
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/cb595deac9a6e3dc0213304db09b5e9410dd7616

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
        libpurple/plugins/statenotify.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/disco.c
        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/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/qq.c pidgin/gtkdialogs.c
        pidgin/gtkstatusbox.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 2833fd1d337477c5b6efc4247a9e6127580414ea)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 73b69273479f1c23e3237343d626c0032425770c)