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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 4e6123df9ea3c65d7120dd6e391ff75104bf266a
Ancestor: 55f17462bcdf93474447c4505853b919e1247311
Ancestor: 62c7f97c4448079c340761c9bf6b5b261b710c09
Author: malu at pidgin.im
Date: 2010-05-18T20:10:11
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/4e6123df9ea3c65d7120dd6e391ff75104bf266a

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/socks5.c
        libpurple/protocols/jabber/socks5.h
        libpurple/protocols/jabber/xfer.c
        libpurple/protocols/jabber/xfer.h
        pidgin/pixmaps/emotes/small/16/grumpy.png
        pidgin/pixmaps/emotes/small/16/invincible.png po/as.po
        po/ml.po
Modified files:
        COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32 NEWS
        configure.ac doc/funniest_home_convos.txt libpurple/ft.c
        libpurple/gconf/Makefile.am libpurple/network.h
        libpurple/protocols/bonjour/bonjour.c
        libpurple/protocols/bonjour/jabber.c
        libpurple/protocols/gg/Makefile.am
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/libgadu-internal.h
        libpurple/protocols/gg/lib/libgadu.h
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth_cyrus.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/data.h
        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/jingle/session.c
        libpurple/protocols/jabber/jingle/session.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/msg.c libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/msn.h
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/slplink.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/chunk.h
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/multimx.h
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/mxit.h
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/protocol.h
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/roster.h
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/snac.c
        libpurple/protocols/yahoo/libymsg.c libpurple/prpl.h
        libpurple/tests/check_libpurple.c libpurple/util.c
        pidgin/Makefile.am pidgin/gtkblist.c pidgin/gtkdialogs.c
        pidgin/gtkdocklet-gtk.c pidgin/gtkimhtml.c
        pidgin/gtksession.c
        pidgin/pixmaps/emotes/small/16/Makefile.am
        pidgin/pixmaps/emotes/small/16/hot.png
        pidgin/win32/gtkwin32dep.c pidgin/win32/nsis/langmacros.nsh
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/nsis/translations/english.nsh pidgin.spec.in
        po/ChangeLog po/af.po po/bn.po po/ca.po po/ca at valencia.po
        po/cs.po po/de.po po/hu.po po/it.po po/mr.po po/nn.po
        po/pl.po po/ro.po po/sk.po po/sl.po po/sq.po po/uk.po
        po/zh_HK.po po/zh_TW.po
Modified attrs:
        pidgin/pixmaps/emotes/small/16/grumpy.png
        pidgin/pixmaps/emotes/small/16/invincible.png

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 55f17462bcdf93474447c4505853b919e1247311)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 62c7f97c4448079c340761c9bf6b5b261b710c09)