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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: fb9b899c752d12814449dd4564c35f1e24c45aa7
Ancestor: 4d90489aa13e9e9e18adca1d89d457730fff6b3a
Ancestor: a9876c2b74baddb4b0fd99eede7daef1d346604b
Author: malu at pidgin.im
Date: 2010-03-10T05:40:40
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/fb9b899c752d12814449dd4564c35f1e24c45aa7

Deleted entries:
        libpurple/protocols/msnp9
        libpurple/protocols/msnp9/Makefile.am
        libpurple/protocols/msnp9/Makefile.mingw
        libpurple/protocols/msnp9/cmdproc.c
        libpurple/protocols/msnp9/cmdproc.h
        libpurple/protocols/msnp9/command.c
        libpurple/protocols/msnp9/command.h
        libpurple/protocols/msnp9/dialog.c
        libpurple/protocols/msnp9/dialog.h
        libpurple/protocols/msnp9/directconn.c
        libpurple/protocols/msnp9/directconn.h
        libpurple/protocols/msnp9/error.c
        libpurple/protocols/msnp9/error.h
        libpurple/protocols/msnp9/group.c
        libpurple/protocols/msnp9/group.h
        libpurple/protocols/msnp9/history.c
        libpurple/protocols/msnp9/history.h
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/httpconn.h
        libpurple/protocols/msnp9/msg.c
        libpurple/protocols/msnp9/msg.h
        libpurple/protocols/msnp9/msn-utils.c
        libpurple/protocols/msnp9/msn-utils.h
        libpurple/protocols/msnp9/msn.c
        libpurple/protocols/msnp9/msn.h
        libpurple/protocols/msnp9/nexus.c
        libpurple/protocols/msnp9/nexus.h
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/msnp9/notification.h
        libpurple/protocols/msnp9/object.c
        libpurple/protocols/msnp9/object.h
        libpurple/protocols/msnp9/page.c
        libpurple/protocols/msnp9/page.h
        libpurple/protocols/msnp9/servconn.c
        libpurple/protocols/msnp9/servconn.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/msnp9/session.h
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slp.h
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/slplink.c
        libpurple/protocols/msnp9/slplink.h
        libpurple/protocols/msnp9/slpmsg.c
        libpurple/protocols/msnp9/slpmsg.h
        libpurple/protocols/msnp9/slpsession.c
        libpurple/protocols/msnp9/slpsession.h
        libpurple/protocols/msnp9/state.c
        libpurple/protocols/msnp9/state.h
        libpurple/protocols/msnp9/switchboard.c
        libpurple/protocols/msnp9/switchboard.h
        libpurple/protocols/msnp9/sync.c
        libpurple/protocols/msnp9/sync.h
        libpurple/protocols/msnp9/table.c
        libpurple/protocols/msnp9/table.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/msnp9/transaction.h
        libpurple/protocols/msnp9/user.c
        libpurple/protocols/msnp9/user.h
        libpurple/protocols/msnp9/userlist.c
        libpurple/protocols/msnp9/userlist.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:
        ChangeLog configure.ac libpurple/ft.c
        libpurple/protocols/Makefile.am
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        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/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/presence.h
        libpurple/protocols/jabber/si.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head a9876c2b74baddb4b0fd99eede7daef1d346604b)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 4d90489aa13e9e9e18adca1d89d457730fff6b3a)