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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 8ef2cdaab810d4bd99784974aba4816fa28fc652
Parent:   05feb74c1c6c8043bd8a617ae0f523fbc7a24cec
Parent:   14fcd8db027bf0876869572cb7c2ef29aac06440
Author:   malu at pidgin.im
Date:     07/08/10 16:51:20
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/8ef2cdaab810d4bd99784974aba4816fa28fc652

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 05feb74c1c6c8043bd8a617ae0f523fbc7a24cec)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 14fcd8db027bf0876869572cb7c2ef29aac06440)

Changes against parent 05feb74c1c6c8043bd8a617ae0f523fbc7a24cec

  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 14fcd8db027bf0876869572cb7c2ef29aac06440

  patched  ChangeLog
  patched  ChangeLog.API
  patched  Makefile.am
  patched  configure.ac
  patched  doc/finch.1.in
  patched  finch/gntaccount.c
  patched  finch/gntrequest.c
  patched  finch/gntsound.c
  patched  finch/libgnt/configure.ac
  patched  finch/libgnt/gntcombobox.c
  patched  finch/libgnt/gnttree.c
  patched  finch/libgnt/gnttree.h
  patched  finch/libgnt/gntutils.c
  patched  libpurple/Makefile.am
  patched  libpurple/plugins/Makefile.mingw
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/util.c
  patched  pidgin/gtkimhtmltoolbar.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/plugins/Makefile.mingw