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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 845ebcaa4efa3cd4cc3a8f3b146f50ee3975cb7c
Parent:   665cb8e84f875c1e8ef2ea97072c5e51ec1dd88d
Parent:   aa203574434cc9c9e6b22ce23282ecc66ddd3069
Author:   malu at pidgin.im
Date:     12/06/10 17:44:17
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/845ebcaa4efa3cd4cc3a8f3b146f50ee3975cb7c

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 665cb8e84f875c1e8ef2ea97072c5e51ec1dd88d)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head aa203574434cc9c9e6b22ce23282ecc66ddd3069)

Changes against parent 665cb8e84f875c1e8ef2ea97072c5e51ec1dd88d

  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 aa203574434cc9c9e6b22ce23282ecc66ddd3069

  added    share/ca-certs/Microsoft_Internet_Authority_2010.pem
  added    share/ca-certs/Microsoft_Secure_Server_Authority_2010.pem
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  libpurple/account.c
  patched  libpurple/certificate.c
  patched  libpurple/ft.c
  patched  libpurple/mime.c
  patched  libpurple/network.c
  patched  libpurple/plugins/ssl/ssl-gnutls.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/httpconn.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/sbconn.c
  patched  libpurple/protocols/msn/sbconn.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/slpmsg_part.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/transaction.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/msn/xfer.c
  patched  libpurple/protocols/msn/xfer.h
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/visibility.c
  patched  libpurple/purple-remote
  patched  libpurple/upnp.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/gtkscrollbook.c
  patched  pidgin/gtkwhiteboard.c
  patched  pidgin/plugins/markerline.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  pidgin.spec.in
  patched  po/ChangeLog
  patched  po/bn.po
  patched  po/ca.po
  patched  po/cs.po
  patched  po/de.po
  patched  po/es.po
  patched  po/hu.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/pl.po
  patched  po/ro.po
  patched  po/sq.po
  patched  po/uk.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po
  patched  share/ca-certs/Makefile.am