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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 027a2882f1b0c6afa30b1b3bc131e6ff984a65b8
Ancestor: 23403faa17b752c8e88650199945fbd8843f3796
Ancestor: 87580b31c6873a43d4adb4cd7361f29d7f1f00d0
Author: malu at pidgin.im
Date: 2009-12-10T21:35:12
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/027a2882f1b0c6afa30b1b3bc131e6ff984a65b8

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
        pidgin/win32/nsis/translations/norwegian_nynorsk.nsh
Modified files:
        ChangeLog ChangeLog.win32 finch/finch.c finch/gntaccount.c
        finch/gntblist.c finch/gntcertmgr.c finch/gntconn.c
        finch/gntconv.c finch/gntdebug.c finch/gntft.c
        finch/gntlog.c finch/gntmedia.c finch/gntnotify.c
        finch/gntplugin.c finch/gntpounce.c finch/libgnt/gntkeys.h
        finch/libgnt/gntutils.c finch/libgnt/wms/s.c
        libpurple/protocols/gg/lib/common.c
        libpurple/protocols/gg/lib/dcc.c
        libpurple/protocols/gg/lib/events.c
        libpurple/protocols/gg/lib/http.c
        libpurple/protocols/gg/lib/libgadu.c
        libpurple/protocols/gg/lib/pubdir.c
        libpurple/protocols/gg/lib/pubdir50.c
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/disco.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.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/libxmpp.c
        libpurple/protocols/jabber/namespaces.h
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/msn/userlist.c
        libpurple/protocols/mxit/actions.c
        libpurple/protocols/mxit/chunk.c
        libpurple/protocols/mxit/cipher.c
        libpurple/protocols/mxit/filexfer.c
        libpurple/protocols/mxit/formcmds.c
        libpurple/protocols/mxit/http.c
        libpurple/protocols/mxit/login.c
        libpurple/protocols/mxit/markup.c
        libpurple/protocols/mxit/multimx.c
        libpurple/protocols/mxit/mxit.c
        libpurple/protocols/mxit/profile.c
        libpurple/protocols/mxit/protocol.c
        libpurple/protocols/mxit/roster.c
        libpurple/protocols/mxit/splashscreen.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/yahoo/ycht.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 23403faa17b752c8e88650199945fbd8843f3796)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 87580b31c6873a43d4adb4cd7361f29d7f1f00d0)