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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 2075a801884dd95a558f1d8cacc9231dec200833
Ancestor: 6156f94369d1203fd0b0c5f2cb275893ddc67c19
Ancestor: cef5a96ccf8d5b3a31bf8124d64acf45f4ae7290
Author: malu at pidgin.im
Date: 2010-04-19T18:53:34
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/2075a801884dd95a558f1d8cacc9231dec200833

Deleted entries:
        pidgin/eggtrayicon.c pidgin/eggtrayicon.h
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 configure.ac
        doc/PERL-HOWTO.dox doc/account-signals.dox
        doc/connection-signals.dox finch/gntblist.c
        libpurple/account.c libpurple/account.h
        libpurple/certificate.c libpurple/connection.c
        libpurple/ft.c libpurple/network.c libpurple/network.h
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/gg.c
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/auth_scram.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/null/nullprpl.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_oservice.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/simple/simple.c
        libpurple/protocols/simple/sipmsg.c
        libpurple/protocols/yahoo/libymsg.c libpurple/util.c
        libpurple/util.h pidgin/Makefile.am pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkeventloop.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtkutils.c
        pidgin/plugins/convcolors.c pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/gestures/stroke-draw.c
        pidgin/plugins/notify.c pidgin/plugins/pidginrc.c
        pidgin/plugins/themeedit.c pidgin/plugins/ticker/gtkticker.c
        pidgin/plugins/timestamp_format.c
        pidgin/plugins/xmppconsole.c po/POTFILES.in po/ca.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 6156f94369d1203fd0b0c5f2cb275893ddc67c19)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head cef5a96ccf8d5b3a31bf8124d64acf45f4ae7290)