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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 649e26b5203399ed4bd576a30bac61961e3470c1
Ancestor: 46523386d682c917679b3de662d51a5bda0da46b
Ancestor: c602ff1f12207582166487fedeb92df15b9e5265
Author: malu at pidgin.im
Date: 2009-06-08T18:27:19
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/649e26b5203399ed4bd576a30bac61961e3470c1

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
        pidgin/plugins/disco/Makefile.am
        pidgin/plugins/disco/gtkdisco.c
        pidgin/plugins/disco/gtkdisco.h
        pidgin/plugins/disco/xmppdisco.c
        pidgin/plugins/disco/xmppdisco.h
Added directories:
        pidgin/plugins/disco
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API configure.ac finch/finch.c
        libpurple/blist.c libpurple/conversation.c libpurple/core.h
        libpurple/media.c libpurple/plugins/psychic.c
        libpurple/plugins/signals-test.c
        libpurple/protocols/gg/buddylist.c
        libpurple/protocols/gg/buddylist.h
        libpurple/protocols/gg/gg.c libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        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/message.c
        libpurple/protocols/jabber/ping.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/notification.h
        libpurple/protocols/msn/session.c
        libpurple/protocols/msn/state.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/msn/userlist.h
        libpurple/protocols/msnp9/session.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/myspace/myspace.h
        libpurple/protocols/myspace/zap.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/silc/buddy.c
        libpurple/protocols/silc/ops.c
        libpurple/protocols/simple/simple.c
        libpurple/protocols/yahoo/yahoo.c
        libpurple/protocols/zephyr/zephyr.c libpurple/proxy.c
        libpurple/proxy.h libpurple/server.c libpurple/theme.c
        libpurple/util.c libpurple/util.h pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.c
        pidgin/gtkmain.c pidgin/gtknotify.c pidgin/gtkprefs.c
        pidgin/gtksmiley.c pidgin/gtksmiley.h pidgin/gtkutils.c
        pidgin/pidginstock.c pidgin/plugins/Makefile.am
        pidgin/plugins/convcolors.c pidgin/plugins/pidginrc.c
        pidgin/plugins/themeedit-icon.h pidgin/plugins/xmppconsole.c
        po/ca.po po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 46523386d682c917679b3de662d51a5bda0da46b)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head c602ff1f12207582166487fedeb92df15b9e5265)