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

malu at pidgin.im malu at pidgin.im
Fri Jun 3 11:21:58 EDT 2011 

----------------------------------------------------------------------
Revision: b64abba4bced5e9d580dddab7991f05b4f77f512
Parent:   10542248985bbed4e43c121418d6bff51d8e449c
Parent:   262d96720193c12bd137a8276fbe63a1280ac67c
Author:   malu at pidgin.im
Date:     06/03/11 11:18:24
Branch:   im.pidgin.cpw.malu.xmpp.jingle_ft
URL: http://d.pidgin.im/viewmtn/revision/info/b64abba4bced5e9d580dddab7991f05b4f77f512

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 262d96720193c12bd137a8276fbe63a1280ac67c)
            to branch 'im.pidgin.cpw.malu.xmpp.jingle_ft' (head 10542248985bbed4e43c121418d6bff51d8e449c)

Changes against parent 10542248985bbed4e43c121418d6bff51d8e449c

  dropped  libpurple/protocols/qq
  dropped  libpurple/protocols/qq/AUTHORS
  dropped  libpurple/protocols/qq/ChangeLog
  dropped  libpurple/protocols/qq/Makefile.am
  dropped  libpurple/protocols/qq/Makefile.mingw
  dropped  libpurple/protocols/qq/buddy_info.c
  dropped  libpurple/protocols/qq/buddy_info.h
  dropped  libpurple/protocols/qq/buddy_list.c
  dropped  libpurple/protocols/qq/buddy_list.h
  dropped  libpurple/protocols/qq/buddy_memo.c
  dropped  libpurple/protocols/qq/buddy_memo.h
  dropped  libpurple/protocols/qq/buddy_opt.c
  dropped  libpurple/protocols/qq/buddy_opt.h
  dropped  libpurple/protocols/qq/char_conv.c
  dropped  libpurple/protocols/qq/char_conv.h
  dropped  libpurple/protocols/qq/file_trans.c
  dropped  libpurple/protocols/qq/file_trans.h
  dropped  libpurple/protocols/qq/group.c
  dropped  libpurple/protocols/qq/group.h
  dropped  libpurple/protocols/qq/group_im.c
  dropped  libpurple/protocols/qq/group_im.h
  dropped  libpurple/protocols/qq/group_info.c
  dropped  libpurple/protocols/qq/group_info.h
  dropped  libpurple/protocols/qq/group_internal.c
  dropped  libpurple/protocols/qq/group_internal.h
  dropped  libpurple/protocols/qq/group_join.c
  dropped  libpurple/protocols/qq/group_join.h
  dropped  libpurple/protocols/qq/group_opt.c
  dropped  libpurple/protocols/qq/group_opt.h
  dropped  libpurple/protocols/qq/im.c
  dropped  libpurple/protocols/qq/im.h
  dropped  libpurple/protocols/qq/packet_parse.c
  dropped  libpurple/protocols/qq/packet_parse.h
  dropped  libpurple/protocols/qq/qq.c
  dropped  libpurple/protocols/qq/qq.h
  dropped  libpurple/protocols/qq/qq_base.c
  dropped  libpurple/protocols/qq/qq_base.h
  dropped  libpurple/protocols/qq/qq_crypt.c
  dropped  libpurple/protocols/qq/qq_crypt.h
  dropped  libpurple/protocols/qq/qq_define.c
  dropped  libpurple/protocols/qq/qq_define.h
  dropped  libpurple/protocols/qq/qq_network.c
  dropped  libpurple/protocols/qq/qq_network.h
  dropped  libpurple/protocols/qq/qq_process.c
  dropped  libpurple/protocols/qq/qq_process.h
  dropped  libpurple/protocols/qq/qq_trans.c
  dropped  libpurple/protocols/qq/qq_trans.h
  dropped  libpurple/protocols/qq/send_file.c
  dropped  libpurple/protocols/qq/send_file.h
  dropped  libpurple/protocols/qq/utils.c
  dropped  libpurple/protocols/qq/utils.h
  dropped  libpurple/tests/test_qq.c
  dropped  pidgin/pixmaps/emblems/16/qq-member.png
  dropped  pidgin/pixmaps/emblems/scalable/qq-member.svg
  dropped  pidgin/pixmaps/emotes/default/24/qq.png
  dropped  pidgin/pixmaps/emotes/default/24/scalable/qq.svg
  dropped  pidgin/pixmaps/protocols/16/qq.png
  dropped  pidgin/pixmaps/protocols/16/scalable/qq.svg
  dropped  pidgin/pixmaps/protocols/22/qq.png
  dropped  pidgin/pixmaps/protocols/22/scalable/qq.svg
  dropped  pidgin/pixmaps/protocols/48/qq.png
  dropped  pidgin/pixmaps/protocols/scalable/qq.svg
  added    po/hr.po
  patched  AUTHORS
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  finch/gntconv.c
  patched  finch/gntnotify.c
  patched  finch/libgnt/gntcolors.c
  patched  libpurple/account.c
  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/ft.c
  patched  libpurple/log.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/media/backend-iface.c
  patched  libpurple/media/backend-iface.h
  patched  libpurple/media.c
  patched  libpurple/media.h
  patched  libpurple/network.c
  patched  libpurple/protocols/Makefile.am
  patched  libpurple/protocols/Makefile.mingw
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/jabber.h
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/message.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/caps.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/jingleinfo.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slpcall.h
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slplink.h
  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/tlv.c
  patched  libpurple/protocols/msn/tlv.h
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/chunk.c
  patched  libpurple/protocols/mxit/chunk.h
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/markup.c
  patched  libpurple/protocols/mxit/multimx.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/profile.h
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/myspace/markup.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/silc/chat.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/proxy.c
  patched  libpurple/proxy.h
  patched  libpurple/signals.c
  patched  libpurple/signals.h
  patched  libpurple/stun.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/tests.h
  patched  libpurple/util.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/pidgintooltip.c
  patched  pidgin/pixmaps/Makefile.am
  patched  pidgin/pixmaps/emotes/default/24/Makefile.am
  patched  pidgin/plugins/vvconfig.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  po/ChangeLog
  patched  po/POTFILES.in
  patched  po/bn.po
  patched  po/ca.po
  patched  po/cs.po
  patched  po/de.po
  patched  po/en_CA.po
  patched  po/fr.po
  patched  po/he.po
  patched  po/hu.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/pa.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

Changes against parent 262d96720193c12bd137a8276fbe63a1280ac67c

  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

More information about the Commits mailing list