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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 0693828b7802c759098b27c6b8f5b8de37bc2d89
Ancestor: 74fb885d02f9d13a9469aee9348aa0020319e274
Ancestor: e155acab29d005538351633111052f094e5f5f98
Author: malu at pidgin.im
Date: 2009-06-11T18:04:30
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/0693828b7802c759098b27c6b8f5b8de37bc2d89

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 NEWS
        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/presence.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.c pidgin/eggtrayicon.c
        pidgin/gtkdocklet-x11.c pidgin/gtkft.c
        pidgin/gtkicon-theme-loader.c po/de.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head e155acab29d005538351633111052f094e5f5f98)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 74fb885d02f9d13a9469aee9348aa0020319e274)