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

[malu at pidgin.im]

-----------------------------------------------------------------
Revision: 75fe8544c3bee73b9a7458e025ae3e9ce383a236
Ancestor: 195bd14d365163a7af4c42f98ee38499ae624444
Ancestor: 6d3fc30a0a0a379281efc5a6872a9c1d7c24c650
Author: malu at pidgin.im
Date: 2009-09-01T18:10:57
Branch: im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/75fe8544c3bee73b9a7458e025ae3e9ce383a236

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 ChangeLog.API finch/Makefile.am
        finch/libgnt/gntmain.c libpurple/Makefile.am
        libpurple/account.c libpurple/blist.h
        libpurple/conversation.h libpurple/core.h libpurple/dnssrv.h
        libpurple/example/Makefile.am libpurple/media-gst.h
        libpurple/media.c libpurple/media.h libpurple/mediamanager.h
        libpurple/plugins/perl/common/XMLNode.xs
        libpurple/protocols/jabber/Makefile.am
        libpurple/protocols/jabber/Makefile.mingw
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/ibb.c
        libpurple/protocols/jabber/ibb.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jabber.h
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jingle/jingle.h
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/libxmpp.c
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/jabber/si.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/yahoo/libymsg.c libpurple/smiley.h
        libpurple/status.h libpurple/tests/test_jabber_jutil.c
        libpurple/theme-loader.c libpurple/theme-loader.h
        libpurple/theme.c libpurple/theme.h libpurple/util.c
        libpurple/util.h pidgin/Makefile.am pidgin/gtkblist.c
        pidgin/gtkdialogs.c pidgin/gtkimhtml.h pidgin/gtkmedia.c
        pidgin/pidginstock.c pidgin/plugins/Makefile.am
        pidgin/plugins/gestures/stroke.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/win32/nsis/pidgin-installer.nsi po/ChangeLog
        po/POTFILES.in po/de.po po/eu.po po/fi.po po/fr.po po/he.po
        po/hu.po po/it.po po/lt.po po/pt_BR.po po/sl.po po/sv.po
        po/zh_CN.po

ChangeLog: 

propagate from branch 'im.pidgin.pidgin' (head 6d3fc30a0a0a379281efc5a6872a9c1d7c24c650)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 195bd14d365163a7af4c42f98ee38499ae624444)