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

[malu at pidgin.im]

----------------------------------------------------------------------
Revision: 3d5b67c436846fee70f48b46f5c9e7d294201ef2
Parent:   a5d0a94df4d5cb31ead75f6f76aadae52f09635f
Parent:   cc46aa375a7fb28bdaf0592faf2103569f8c2d34
Author:   malu at pidgin.im
Date:     11/15/10 17:01:53
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/3d5b67c436846fee70f48b46f5c9e7d294201ef2

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head a5d0a94df4d5cb31ead75f6f76aadae52f09635f)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head cc46aa375a7fb28bdaf0592faf2103569f8c2d34)

Changes against parent a5d0a94df4d5cb31ead75f6f76aadae52f09635f

  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 cc46aa375a7fb28bdaf0592faf2103569f8c2d34

  patched  ChangeLog
  patched  libpurple/protocols/jabber/si.c
  patched  po/POTFILES.in
  patched  po/de.po