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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 7d135c692770e88426d5960db78c337aba999f56
Parent:   c0e633bbd723352b9614b1bfcfab551e416a29dc
Parent:   f88e36a353671a00d318735c4bd9d8958aea6292
Author:   malu at pidgin.im
Date:     02/02/11 18:03:29
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/7d135c692770e88426d5960db78c337aba999f56

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head c0e633bbd723352b9614b1bfcfab551e416a29dc)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head f88e36a353671a00d318735c4bd9d8958aea6292)

Changes against parent c0e633bbd723352b9614b1bfcfab551e416a29dc

  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 f88e36a353671a00d318735c4bd9d8958aea6292

  added    libpurple/protocols/jabber/auth_digest_md5.h
  added    libpurple/tests/test_jabber_digest_md5.c
  added    share/ca-certs/AddTrust_External_Root.pem
  patched  COPYRIGHT
  patched  ChangeLog
  patched  configure.ac
  patched  libpurple/certificate.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/mediamanager.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_digest_md5.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/sbconn.c
  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/novell/novell.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/zephyr/Zinternal.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/tests.h
  patched  pidgin/gtkutils.c
  patched  pidgin/plugins/vvconfig.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  pidgin/win32/winpidgin.c
  patched  po/POTFILES.in
  patched  po/ar.po
  patched  po/az.po
  patched  po/ca.po
  patched  po/de.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_GB.po
  patched  po/eu.po
  patched  po/fr.po
  patched  po/gl.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/mn.po
  patched  po/ms_MY.po
  patched  po/ta.po
  patched  share/ca-certs/Makefile.am