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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: d5d0e39cb3981e294581d66ea031f2ea7fcd313d
Ancestor: 06bc53f1491b09aeafe0fd9fa5e1afe0c7559264
Ancestor: 7635af82fd23cb8baaab2cab5a8cbeb76f3ea5be
Author: malu at pidgin.im
Date: 2010-01-21T21:55:04
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/d5d0e39cb3981e294581d66ea031f2ea7fcd313d

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 po/mr.po
Modified files:
        ChangeLog configure.ac finch/libgnt/gntutils.c
        libpurple/ft.c libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.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/si.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/qq/Makefile.am
        libpurple/tests/Makefile.am pidgin/gtkconv.c
        pidgin/gtkdialogs.c pidgin/gtkstatusbox.c pidgin/gtkutils.c
        pidgin/win32/nsis/translations/polish.nsh po/ChangeLog
        po/af.po po/cs.po po/gu.po po/kn.po po/nn.po po/pl.po
        po/ru.po po/sq.po po/sv.po po/uk.po po/zh_CN.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 7635af82fd23cb8baaab2cab5a8cbeb76f3ea5be)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 06bc53f1491b09aeafe0fd9fa5e1afe0c7559264)