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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: a65293ff0a56115f100becc62cd06f77ebad6cd1
Ancestor: 4a2d7c0b8570558cada900f60d7696231954c231
Ancestor: d45734a9b6aeef67f8a8e8187c2bcee62cb483b1
Author: malu at pidgin.im
Date: 2009-04-28T22:09:52
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/a65293ff0a56115f100becc62cd06f77ebad6cd1

Added files:
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        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/useravatar.c
        libpurple/protocols/jabber/useravatar.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h
Modified files:
        COPYRIGHT ChangeLog libpurple/conversation.c
        libpurple/core.c libpurple/dnssrv.c libpurple/dnssrv.h
        libpurple/idle.c libpurple/media.c libpurple/media.h
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/data.c
        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/jingle/session.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/pep.c
        libpurple/protocols/jabber/pep.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/usermood.c
        libpurple/protocols/jabber/usernick.c
        libpurple/protocols/jabber/usertune.c
        libpurple/protocols/yahoo/yahoo.c libpurple/savedstatuses.c
        libpurple/server.c pidgin/gtkstatusbox.c po/POTFILES.in
        po/fi.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 4a2d7c0b8570558cada900f60d7696231954c231)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head d45734a9b6aeef67f8a8e8187c2bcee62cb483b1)