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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 2df302c68e848da0bb0cfd71989654e6906fef14
Ancestor: 9953e3b86db32def937899bca8dc07d159f11eae
Ancestor: b464ecdf350776f3dadd0ecfdee7425eeea5adce
Author: malu at pidgin.im
Date: 2009-08-11T18:31:16
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/2df302c68e848da0bb0cfd71989654e6906fef14

Added files:
        doc/jabber-signals.dox
        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 ChangeLog.API ChangeLog.win32 doc/Makefile.am
        doc/funniest_home_convos.txt finch/gntaccount.c
        finch/gntblist.c finch/gntmedia.c libpurple/certificate.c
        libpurple/cipher.c libpurple/connection.c
        libpurple/desktopitem.c libpurple/ft.c libpurple/ft.h
        libpurple/log.c libpurple/marshallers.list libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/irc/irc.c libpurple/protocols/irc/irc.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/bosh.h
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        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/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/directconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/protocols/zephyr/internal.h libpurple/purple.h.in
        libpurple/signals.c libpurple/tests/test_yahoo_util.c
        libpurple/util.c libpurple/xmlnode.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.c
        pidgin/gtkmedia.c pidgin/gtkprefs.c pidgin/gtkstatusbox.c
        pidgin/gtkthemes.c pidgin/gtkwhiteboard.c
        pidgin/plugins/crazychat/glm.c
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/italian.nsh pidgin.spec.in
        po/ChangeLog po/es.po po/eu.po po/it.po po/nn.po po/ru.po
        po/sl.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 9953e3b86db32def937899bca8dc07d159f11eae)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head b464ecdf350776f3dadd0ecfdee7425eeea5adce)