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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 35f7ddfb0a09c918cfda0e20505493585eba5ad9
Ancestor: 191873f724e4551edc337f1e018980f32c41391b
Ancestor: f8c427ef524d01d3dffb3dcbc7f0c52fa490ae4f
Author: malu at pidgin.im
Date: 2009-05-13T20:32:21
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/35f7ddfb0a09c918cfda0e20505493585eba5ad9

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:
        COPYRIGHT ChangeLog ChangeLog.API Makefile.mingw
        libpurple/dbus-analyze-functions.py
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/buddy.h
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/caps.h
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/disco.h
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/iq.c
        libpurple/protocols/jabber/iq.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/oob.h
        libpurple/protocols/jabber/ping.h
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/jabber/si.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/msnp9/notification.c
        libpurple/protocols/myspace/myspace.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/yahoo/yahoo.c libpurple/win32/global.mak
        pidgin/gtkconv.c pidgin/gtknotify.c
        pidgin/win32/pidgin_dll_rc.rc.in
        pidgin/win32/pidgin_exe_rc.rc.in po/ca.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 191873f724e4551edc337f1e018980f32c41391b)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head f8c427ef524d01d3dffb3dcbc7f0c52fa490ae4f)