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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: aa504527d5b4be50b85c1855b29d00d8836be25d
Ancestor: 8cc16fcb41111aae817fe10168b40d82990895c5
Ancestor: ad5fe7d4a607ffbb8e963ab78cd264d0c8fb96c9
Author: malu at pidgin.im
Date: 2010-02-14T22:21:47
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/aa504527d5b4be50b85c1855b29d00d8836be25d

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 po/or.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac
        doc/finch.1.in finch/libgnt/gnttree.c finch/libgnt/gntwm.c
        finch/libgnt/wms/irssi.c libpurple/buddyicon.c
        libpurple/dnssrv.c libpurple/ft.c libpurple/media.c
        libpurple/network.h libpurple/plugins/perl/perl-common.c
        libpurple/plugins/perl/perl-common.h
        libpurple/plugins/perl/perl-handlers.c libpurple/prefs.h
        libpurple/protocols/bonjour/parser.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/data.h
        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/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/cmdproc.h
        libpurple/protocols/msn/command.h
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/contact.h
        libpurple/protocols/msn/dialog.h
        libpurple/protocols/msn/directconn.h
        libpurple/protocols/msn/error.h
        libpurple/protocols/msn/group.h
        libpurple/protocols/msn/history.h
        libpurple/protocols/msn/httpconn.h
        libpurple/protocols/msn/msg.h libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/msnutils.h
        libpurple/protocols/msn/nexus.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/object.h
        libpurple/protocols/msn/oim.h libpurple/protocols/msn/page.h
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/session.h
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/soap.h
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/state.h
        libpurple/protocols/msn/switchboard.h
        libpurple/protocols/msn/sync.h
        libpurple/protocols/msn/table.h
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/msn/user.h
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/session.c
        libpurple/protocols/myspace/session.h
        libpurple/protocols/myspace/user.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_friend.c libpurple/proxy.c
        libpurple/tests/test_util.c libpurple/util.c
        libpurple/util.h libpurple/win32/targets.mak
        libpurple/xmlnode.c pidgin/gtkaccount.c
        pidgin/gtkblist-theme-loader.c pidgin/gtkblist-theme.c
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdebug.c
        pidgin/gtkdialogs.c pidgin/gtkft.c pidgin/gtkimhtml.c
        pidgin/gtkpounce.c pidgin/gtkprefs.c pidgin/gtkrequest.c
        pidgin/gtksmiley.c pidgin/gtksmiley.h pidgin/gtkstatusbox.c
        pidgin/gtkthemes.c pidgin/gtkutils.c pidgin/gtkwhiteboard.c
        pidgin/plugins/timestamp.c pidgin/win32/gtkwin32dep.c
        po/ChangeLog po/bn.po po/cs.po po/de.po po/es.po po/fr.po
        po/gu.po po/kn.po po/mr.po po/nb.po po/nn.po po/pa.po
        po/pl.po po/ru.po po/sl.po po/ta.po po/uk.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 8cc16fcb41111aae817fe10168b40d82990895c5)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head ad5fe7d4a607ffbb8e963ab78cd264d0c8fb96c9)