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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 16448198be138531743791081bb5bfa573aaff87
Parent:   1e2365e0d77dd8de9ad8162e88e4166a2fdefcfd
Parent:   c3a490612935a86e11f1c6d34e9c6838827f1d61
Author:   malu at pidgin.im
Date:     06/30/10 17:43:02
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/16448198be138531743791081bb5bfa573aaff87

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 1e2365e0d77dd8de9ad8162e88e4166a2fdefcfd)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head c3a490612935a86e11f1c6d34e9c6838827f1d61)

Changes against parent 1e2365e0d77dd8de9ad8162e88e4166a2fdefcfd

  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

Changes against parent c3a490612935a86e11f1c6d34e9c6838827f1d61

  patched  COPYRIGHT
  patched  ChangeLog
  patched  finch/finch.c
  patched  finch/gntdebug.c
  patched  libpurple/certificate.c
  patched  libpurple/connection.c
  patched  libpurple/protocols/irc/cmds.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/namespaces.h
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtkprefs.c