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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 29e889f698380bbbac8050bd3e6f611cff550245
Ancestor: 36b35bf20f2241715ed73acb6954bc0cb49ce7e0
Ancestor: 80c06f6950b5ea3ca311d8e4752ad5b19ea84059
Author: malu at pidgin.im
Date: 2009-08-01T00:36:32
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/29e889f698380bbbac8050bd3e6f611cff550245

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
        libpurple/tests/test_yahoo_util.c
        share/ca-certs/Thawte_Premium_Server_CA.pem
Modified files:
        COPYRIGHT Makefile.mingw libpurple/certificate.c
        libpurple/ft.c libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/soap.c
        libpurple/protocols/oscar/family_icq.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/zephyr/ZVariables.c
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c libpurple/tests/tests.h
        pidgin/plugins/themeedit-icon.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog po/af.po
        po/ca at valencia.po po/de.po po/hu.po po/sk.po po/sv.po
        share/ca-certs/Makefile.am

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 80c06f6950b5ea3ca311d8e4752ad5b19ea84059)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 36b35bf20f2241715ed73acb6954bc0cb49ce7e0)