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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 02525c65f6d62911ac54c3edacb0cb61ae827c16
Ancestor: 60bf299699fc79135618d90437b614713a06fa94
Ancestor: 70d69397ed952b26b453423c381c70d6783eb66d
Author: malu at pidgin.im
Date: 2009-08-13T17:07:38
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/02525c65f6d62911ac54c3edacb0cb61ae827c16

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 libpurple/ft.c libpurple/media.c
        libpurple/mediamanager.c libpurple/pounce.c
        libpurple/prefs.c libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        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/jingle/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/cmdproc.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/sync.h
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h libpurple/proxy.c
        libpurple/savedstatuses.c libpurple/status.c
        pidgin/gtkdialogs.c pidgin/gtkmedia.c po/ChangeLog po/ro.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 70d69397ed952b26b453423c381c70d6783eb66d)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 60bf299699fc79135618d90437b614713a06fa94)