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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: d9902f56469e034a5af37f485e17b7ef6ba3bc85
Ancestor: 8bcef26698169f382f630139bc3d6bd0de3e22b0
Ancestor: fe4644296ed29ff3456121616137d3b6c04d9ee8
Author: malu at pidgin.im
Date: 2010-03-18T21:24:53
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/d9902f56469e034a5af37f485e17b7ef6ba3bc85

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 ChangeLog.win32 Makefile.mingw
        configure.ac libpurple/ft.c
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/caps.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/namespaces.h
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/win32/global.mak libpurple/win32/rules.mak
        pidgin/gtkblist.c pidgin/gtkdialogs.c pidgin/gtkimhtml.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/plugins/xmppconsole.c
        pidgin/win32/nsis/generate_gtk_zip.sh
        pidgin/win32/winpidgin.c pidgin/win32/wspell.c
        po/POTFILES.in

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head fe4644296ed29ff3456121616137d3b6c04d9ee8)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 8bcef26698169f382f630139bc3d6bd0de3e22b0)