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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 84e0c74617c4b08ace10929291671ce130caa03d
Ancestor: 3817d6fd81f4052bb57cd8ad113d8ffd8028591b
Ancestor: fe1b31777c60fdedb546be16b35973db21634712
Author: malu at pidgin.im
Date: 2009-09-29T07:29:44
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/84e0c74617c4b08ace10929291671ce130caa03d

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 finch/gntaccount.c
        libpurple/connection.c libpurple/dbus-server.c
        libpurple/dnsquery.c libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/server.c libpurple/util.c
        pidgin/plugins/win32/winprefs/winprefs.c
        pidgin/win32/nsis/pidgin-installer.nsi po/sv.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 3817d6fd81f4052bb57cd8ad113d8ffd8028591b)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head fe1b31777c60fdedb546be16b35973db21634712)