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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 49386e2803b1aa94c02cd6bd90f70376a9c3e77c
Ancestor: 53abc38e3dfd2e9f8ae8c3e6532379d4b0dc333b
Ancestor: c28e464c75e9ed6824d45a7390f5efc2b76cc0a1
Author: malu at pidgin.im
Date: 2009-07-12T20:47:32
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/49386e2803b1aa94c02cd6bd90f70376a9c3e77c

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 ChangeLog.API Makefile.mingw
        configure.ac finch/finch.c finch/gntconv.c
        libpurple/Makefile.am libpurple/blist.c libpurple/blist.h
        libpurple/dnsquery.c libpurple/ft.c libpurple/internal.h
        libpurple/plugins/perl/common/Makefile.mingw
        libpurple/plugins/perl/perl.c
        libpurple/plugins/ssl/ssl-nss.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.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/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/message.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/httpconn.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/myspace/markup.c
        libpurple/protocols/oscar/clientlogin.c
        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/util.c
        libpurple/protocols/qq/buddy_info.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/yahoo/Makefile.mingw
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_aliases.c
        libpurple/protocols/yahoo/yahoo_aliases.h
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/protocols/yahoo/yahoo_packet.c
        libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_util.c libpurple/util.c
        libpurple/util.h libpurple/win32/global.mak
        libpurple/win32/targets.mak libpurple/win32/win32dep.c
        pidgin/gtkaccount.c pidgin/gtkblist.c pidgin/gtkconv.c
        pidgin/gtkmain.c pidgin/gtkrequest.c pidgin/gtkutils.c
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/gevolution/add_buddy_dialog.c
        pidgin/plugins/gevolution/assoc-buddy.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/gevolution/gevolution.c
        pidgin/plugins/perl/common/Makefile.mingw
        pidgin/win32/nsis/pidgin-installer.nsi pidgin.spec.in
        po/POTFILES.in po/af.po po/am.po po/ar.po po/az.po
        po/be at latin.po po/bg.po po/bn.po po/bs.po po/ca.po
        po/ca at valencia.po po/cs.po po/da.po po/de.po po/dz.po
        po/el.po po/en_AU.po po/en_CA.po po/en_GB.po po/eo.po
        po/es.po po/et.po po/eu.po po/fa.po po/fi.po po/fr.po
        po/ga.po po/gl.po po/gu.po po/he.po po/hi.po po/hu.po
        po/hy.po po/id.po po/it.po po/ja.po po/ka.po po/km.po
        po/kn.po po/ko.po po/ku.po po/lo.po po/lt.po po/mk.po
        po/mn.po po/my_MM.po po/nb.po po/ne.po po/nl.po po/nn.po
        po/oc.po po/pa.po po/pl.po po/ps.po po/pt.po po/pt_BR.po
        po/ro.po po/ru.po po/si.po po/sk.po po/sl.po po/sq.po
        po/sr.po po/sr at latin.po po/sv.po po/sw.po po/ta.po po/te.po
        po/th.po po/tr.po po/uk.po po/ur.po po/vi.po po/xh.po
        po/zh_CN.po po/zh_HK.po po/zh_TW.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 53abc38e3dfd2e9f8ae8c3e6532379d4b0dc333b)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head c28e464c75e9ed6824d45a7390f5efc2b76cc0a1)