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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: bd147f40f71986709e1a743faab215fd27b239ad
Ancestor: 70ee6c0f2e2858657f0eb06a128db6abd076bdb7
Ancestor: 90452c488a9c2660b74c9c6d9f0c14aec726e9c6
Author: malu at pidgin.im
Date: 2009-11-23T21:32:12
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/bd147f40f71986709e1a743faab215fd27b239ad

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 po/ms_MY.po
Modified files:
        ChangeLog configure.ac finch/gntblist.c
        finch/libgnt/gntbox.c finch/libgnt/gntbutton.c
        finch/libgnt/gntcheckbox.c finch/libgnt/gntcombobox.c
        finch/libgnt/gntentry.c finch/libgnt/gntinternal.h
        finch/libgnt/gntlabel.c finch/libgnt/gntmain.c
        finch/libgnt/gntmenu.c finch/libgnt/gnttextview.c
        finch/libgnt/gnttree.c finch/libgnt/gntws.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/jabber/usermood.c
        libpurple/protocols/msn/msn.h
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/splashscreen.h
        libpurple/protocols/oscar/odc.c
        libpurple/protocols/oscar/oscar.c libpurple/prpl.h
        libpurple/server.h libpurple/tests/test_jabber_jutil.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.c
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c pidgin/gtkprefs.c
        pidgin/gtksavedstatuses.c po/ChangeLog po/de.po po/he.po
        po/nn.po po/stats.pl po/uk.po po/zh_CN.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 70ee6c0f2e2858657f0eb06a128db6abd076bdb7)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 90452c488a9c2660b74c9c6d9f0c14aec726e9c6)