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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: fe1b31777c60fdedb546be16b35973db21634712
Ancestor: 29f6b9d81574bfa9235dbd438a8934f06552e368
Ancestor: 883f438b80edeba99c90cd9e50740ca8b711bc57
Author: malu at pidgin.im
Date: 2009-09-20T19:56:38
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/fe1b31777c60fdedb546be16b35973db21634712

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 ChangeLog.API doc/finch.1.in doc/pidgin.1.in
        finch/gntconv.c libpurple/account.c libpurple/account.h
        libpurple/media.c libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msn.c libpurple/protocols/msn/oim.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/libymsg.c
        libpurple/tests/test_jabber_jutil.c libpurple/util.c
        pidgin/gtkconv.c pidgin/gtkprefs.c pidgin/gtksound.c
        pidgin/win32/winpidgin.c po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 29f6b9d81574bfa9235dbd438a8934f06552e368)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 883f438b80edeba99c90cd9e50740ca8b711bc57)