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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 6c6d261d95804de9dfc66cd3ca8689fb4b170c68
Ancestor: 0b0ca0846f264e4126ca831b7aea27fdd1605783
Ancestor: 580055bb22fea0076d3a90d9df9346abd1789bab
Author: malu at pidgin.im
Date: 2009-04-13T09:30:59
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/6c6d261d95804de9dfc66cd3ca8689fb4b170c68

Deleted entries:
        libpurple/protocols/toc
Added files:
        finch/libgnt/gntprogressbar.c finch/libgnt/gntprogressbar.h
        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/gntconv.c finch/gntmedia.c finch/libgnt/Makefile.am
        finch/libgnt/gnttree.c finch/plugins/gnttinyurl.c
        libpurple/Makefile.am libpurple/Makefile.mingw
        libpurple/account.c libpurple/blist.c libpurple/blist.h
        libpurple/buddyicon.c libpurple/conversation.c
        libpurple/conversation.h libpurple/core.c libpurple/media.c
        libpurple/media.h libpurple/mediamanager.c
        libpurple/mediamanager.h libpurple/network.c
        libpurple/plugin.c libpurple/plugin.h
        libpurple/plugins/filectl.c libpurple/plugins/joinpart.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        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/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jingle/rtp.c
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msnp9/httpconn.c
        libpurple/protocols/msnp9/slp.c
        libpurple/protocols/msnp9/slpcall.c
        libpurple/protocols/msnp9/slpcall.h
        libpurple/protocols/msnp9/transaction.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/peer.c
        libpurple/protocols/sametime/sametime.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/zephyr/zephyr.c libpurple/prpl.c
        libpurple/prpl.h libpurple/stun.c libpurple/theme-manager.c
        libpurple/win32/win32dep.c pidgin/gtkblist-theme-loader.c
        pidgin/gtkblist-theme.c pidgin/gtkblist-theme.h
        pidgin/gtkblist.c pidgin/gtkconv.c pidgin/gtkdebug.c
        pidgin/gtkmain.c pidgin/gtkmedia.c pidgin/gtkmedia.h
        pidgin/gtkplugin.c pidgin/gtksound.c pidgin/gtkstatusbox.c
        pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/plugins/cap/cap.c pidgin/plugins/mailchk.c
        pidgin/plugins/musicmessaging/musicmessaging.c

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 580055bb22fea0076d3a90d9df9346abd1789bab)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 0b0ca0846f264e4126ca831b7aea27fdd1605783)