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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 7ad65bd74c75e6f95a05ba952e36637a84866236
Ancestor: 518b31c1c113e4cfda3ac52a6df8d781339512b3
Ancestor: b7579b4bc8103a92e947c945e22390d9e547cc65
Author: malu at pidgin.im
Date: 2009-03-17T10:51:39
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/7ad65bd74c75e6f95a05ba952e36637a84866236

Added files:
        libpurple/plugins/one_time_password.c
        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/xfer.c
        libpurple/protocols/jabber/xfer.h
Modified files:
        COPYRIGHT ChangeLog.API configure.ac
        doc/funniest_home_convos.txt libpurple/account.h
        libpurple/connection.h libpurple/ft.c libpurple/media.c
        libpurple/plugins/Makefile.am
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        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/jingle/rtp.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/oscar/bstream.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo.h
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.h
        libpurple/purple-url-handler libpurple/util.c
        libpurple/xmlnode.c libpurple/xmlnode.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkmain.c
        po/ca.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin.vv' (head b7579b4bc8103a92e947c945e22390d9e547cc65)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 518b31c1c113e4cfda3ac52a6df8d781339512b3)