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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: c7f124580a043577d00dd26dc9987ee5ff76c058
Ancestor: 016d96cd3d2c3e0c9966b9209bae225a8d3cb696
Ancestor: 027a2882f1b0c6afa30b1b3bc131e6ff984a65b8
Author: malu at pidgin.im
Date: 2010-01-01T01:51:35
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/c7f124580a043577d00dd26dc9987ee5ff76c058

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
        finch/gntidle.c finch/gntrequest.c finch/gntstatus.c
        finch/libgnt/gntinternal.h finch/libgnt/gntline.c
        finch/libgnt/gntmenuitem.c finch/libgnt/gntmenuitemcheck.c
        finch/libgnt/gntprogressbar.c finch/libgnt/gntslider.c
        finch/libgnt/gntwidget.c finch/libgnt/gntwindow.c
        finch/libgnt/wms/irssi.c libpurple/certificate.c
        libpurple/conversation.h libpurple/ft.c libpurple/media.h
        libpurple/plugins/perl/common/Log.xs
        libpurple/plugins/perl/common/Proxy.xs
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        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/si.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slp.h
        libpurple/protocols/msn/slpcall.c
        libpurple/protocols/msn/slpcall.h
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msn/slplink.h
        libpurple/protocols/msn/slpmsg.c
        libpurple/protocols/msn/slpmsg.h
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/myspace/user.c
        libpurple/protocols/myspace/user.h
        libpurple/protocols/oscar/oscar.c
        libpurple/purple-uninstalled.pc.in
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_cipher.c pidgin/gtkdialogs.c
        pidgin/gtkft.c pidgin/gtkimhtml.c pidgin/gtkprefs.c
        pidgin/pidgin-uninstalled.pc.in po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 016d96cd3d2c3e0c9966b9209bae225a8d3cb696)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 027a2882f1b0c6afa30b1b3bc131e6ff984a65b8)