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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: e32779569b0f3d04fbf192de276fec9f01d4f615
Ancestor: 55cc6e317f8651055c17a031024f0304271311cb
Ancestor: a65293ff0a56115f100becc62cd06f77ebad6cd1
Author: malu at pidgin.im
Date: 2009-04-29T05:18:27
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/e32779569b0f3d04fbf192de276fec9f01d4f615

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.API libpurple/dnssrv.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/bosh.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/oscar/family_chatnav.c
        libpurple/protocols/oscar/family_locate.c pidgin/gtkutils.c
        pidgin/gtkutils.h pidgin/plugins/ticker/ticker.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 55cc6e317f8651055c17a031024f0304271311cb)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head a65293ff0a56115f100becc62cd06f77ebad6cd1)