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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 18138050e9fb9b1187935fc3c037781906870fc1
Ancestor: 0d33eae1cfd57cb5f459518ad5db14230f13792b
Ancestor: b220cc997290b130f8db27cfa84e45fbc00b0d21
Author: malu at pidgin.im
Date: 2009-10-20T22:31:44
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/18138050e9fb9b1187935fc3c037781906870fc1

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:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac libpurple/certificate.c libpurple/dnssrv.c
        libpurple/ft.h libpurple/media.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        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/message.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/user.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/tests/test_jabber_jutil.c pidgin/gtkmedia.c
        pidgin/gtkroomlist.c pidgin/gtkutils.c
        pidgin/plugins/disco/gtkdisco.c po/ChangeLog

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 0d33eae1cfd57cb5f459518ad5db14230f13792b)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head b220cc997290b130f8db27cfa84e45fbc00b0d21)