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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 71b2a5cff40ba5a648b73ff9b62b88ec21bce828
Ancestor: 37329f033a30f4f4f5048f9fdc86df4400e3ada5
Ancestor: cc37a004c31419ee24d9f534499ccbd94776e2f1
Author: malu at pidgin.im
Date: 2009-11-09T20:41:21
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/71b2a5cff40ba5a648b73ff9b62b88ec21bce828

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/protocols/mxit/Makefile.am
        libpurple/protocols/mxit/Makefile.mingw
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/actions.h
        libpurple/protocols/mxit/aes.c
        libpurple/protocols/mxit/aes.h
        libpurple/protocols/mxit/chunk.c
        libpurple/protocols/mxit/chunk.h
        libpurple/protocols/mxit/cipher.c
        libpurple/protocols/mxit/cipher.h
        libpurple/protocols/mxit/filexfer.c
        libpurple/protocols/mxit/filexfer.h
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/formcmds.h
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/http.h
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/login.h
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/markup.h
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/multimx.h
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/mxit/profile.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/protocol.h
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/roster.h
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/mxit/splashscreen.h
        pidgin/pixmaps/protocols/16/mxit.png
        pidgin/pixmaps/protocols/22/mxit.png
        pidgin/pixmaps/protocols/48/mxit.png
        pidgin/pixmaps/protocols/scalable/mxit.svg
Added directories:
        libpurple/protocols/mxit
Modified files:
        COPYRIGHT ChangeLog configure.ac finch/libgnt/gnttree.c
        libpurple/protocols/Makefile.am
        libpurple/protocols/bonjour/mdns_avahi.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/oob.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/useravatar.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/flap_connection.c
        libpurple/protocols/oscar/libaim.c
        libpurple/protocols/oscar/libicq.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h pidgin/gtkmain.c
        pidgin/gtkprefs.c pidgin/pixmaps/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/gtkdisco.h pidgin.desktop.in
        po/POTFILES.in
Modified attrs:
        pidgin/pixmaps/protocols/16/mxit.png
        pidgin/pixmaps/protocols/22/mxit.png
        pidgin/pixmaps/protocols/48/mxit.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 37329f033a30f4f4f5048f9fdc86df4400e3ada5)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head cc37a004c31419ee24d9f534499ccbd94776e2f1)