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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 4c836644adb5d78f5df9ff86749fde1cf52b78fe
Ancestor: 9afa0cfda64ff9907b43b21fe64f17f698d2aa0d
Ancestor: f0dcbb7d22a69defe1f4f1c0242a8ae036e41d18
Author: malu at pidgin.im
Date: 2009-10-12T18:44:07
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/4c836644adb5d78f5df9ff86749fde1cf52b78fe

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
        share/ca-certs/Entrust.net_Secure_Server_CA.pem
Modified files:
        ChangeLog configure.ac finch/gntblist.c
        finch/libgnt/gntbindable.h finch/libgnt/gntbox.c
        finch/libgnt/gntentry.c finch/libgnt/gntfilesel.c
        finch/libgnt/gnttextview.c finch/libgnt/gntutils.c
        finch/plugins/gnttinyurl.c libpurple/account.c
        libpurple/certificate.c libpurple/ft.c
        libpurple/plugins/perl/common/Prpl.xs
        libpurple/plugins/perl/perl.c
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        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/parser.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h
        libpurple/tests/test_yahoo_util.c pidgin/gtkprefs.c
        pidgin/win32/nsis/pidgin-installer.nsi po/de.po
        share/ca-certs/Makefile.am

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 9afa0cfda64ff9907b43b21fe64f17f698d2aa0d)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head f0dcbb7d22a69defe1f4f1c0242a8ae036e41d18)