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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: f103ea1850f0b66ee86ac94d1303bbc5437fbf58
Parent:   5663a88b979c18ddf7efc848571a880ff8ae503e
Parent:   8ef2cdaab810d4bd99784974aba4816fa28fc652
Author:   malu at pidgin.im
Date:     07/18/10 06:22:29
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/f103ea1850f0b66ee86ac94d1303bbc5437fbf58

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 5663a88b979c18ddf7efc848571a880ff8ae503e)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 8ef2cdaab810d4bd99784974aba4816fa28fc652)

Changes against parent 5663a88b979c18ddf7efc848571a880ff8ae503e

  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 8ef2cdaab810d4bd99784974aba4816fa28fc652

  added    libpurple/tests/test_jabber_caps.c
  patched  ChangeLog
  patched  doc/finch.1.in
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/caps.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/xdata.c
  patched  libpurple/protocols/jabber/xdata.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/tests.h
  patched  libpurple/upnp.c
  patched  libpurple/util.c
  patched  libpurple/xmlnode.c
  patched  libpurple/xmlnode.h