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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 11591610a51f3f460fff8d7839337ae18d7d32c6
Ancestor: 22bd92ef42ba7a2bf5975c87f6df68e601fc9d0d
Ancestor: 6b28d34173486d3e4f658f62a61c93b56a489cb0
Author: malu at pidgin.im
Date: 2009-06-25T08:58:35
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/11591610a51f3f460fff8d7839337ae18d7d32c6

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
        libpurple/protocols/oscar/clientlogin.c
Modified files:
        ChangeLog configure.ac libpurple/cipher.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/caps.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/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/oscar/Makefile.am
        libpurple/protocols/oscar/Makefile.mingw
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscar_data.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_picture.c
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 6b28d34173486d3e4f658f62a61c93b56a489cb0)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 22bd92ef42ba7a2bf5975c87f6df68e601fc9d0d)