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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 32eb9022bfbadd7e098ebe391682a50d28ecbe61
Parent:   601cba741c2f748337d955ce319f50ece3b97264
Parent:   e4e4cfc6e43fbbd1e3e564249fca2cfdbf68ee23
Author:   malu at pidgin.im
Date:     09/30/10 16:42:34
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/32eb9022bfbadd7e098ebe391682a50d28ecbe61

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head e4e4cfc6e43fbbd1e3e564249fca2cfdbf68ee23)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 601cba741c2f748337d955ce319f50ece3b97264)

Changes against parent 601cba741c2f748337d955ce319f50ece3b97264

  patched  COPYRIGHT
  patched  ChangeLog
  patched  libpurple/certificate.c
  patched  libpurple/dnssrv.c
  patched  libpurple/network.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_plain.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/jabber/google/google_session.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  libpurple/protocols/oscar/visibility.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/purple-remote
  patched  libpurple/util.c
  patched  libpurple/win32/libc_interface.c
  patched  pidgin/Makefile.am
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdebug.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkplugin.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/win32/gtkwin32dep.c
  patched  pidgin/win32/wspell.c
  patched  po/de.po

Changes against parent e4e4cfc6e43fbbd1e3e564249fca2cfdbf68ee23

  added    libpurple/protocols/jabber/jingle/file-transfer.c
  added    libpurple/protocols/jabber/jingle/file-transfer.h
  added    libpurple/protocols/jabber/jingle/ibbs.c
  added    libpurple/protocols/jabber/jingle/ibbs.h
  added    libpurple/protocols/jabber/jingle/s5b.c
  added    libpurple/protocols/jabber/jingle/s5b.h
  added    libpurple/protocols/jabber/socks5.c
  added    libpurple/protocols/jabber/socks5.h
  added    libpurple/protocols/jabber/xfer.c
  added    libpurple/protocols/jabber/xfer.h
  patched  libpurple/ft.c
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/Makefile.mingw
  patched  libpurple/protocols/jabber/data.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/jabber/jingle/jingle.h
  patched  libpurple/protocols/jabber/jingle/rtp.c
  patched  libpurple/protocols/jabber/jingle/session.c
  patched  libpurple/protocols/jabber/jingle/session.h
  patched  libpurple/protocols/jabber/libxmpp.c
  patched  libpurple/protocols/jabber/si.c