pidgin: fcd72ef6: propagate from branch 'im.pidgin.pidgin....

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: fcd72ef630601a5c9de2e8465f3502ef38b67235
Parent:   3d58b1f843fc2aebf9411756956d07ae96951623
Parent:   68d280808dc7fafe82192c72f81929fa14b14b5c
Author:   rekkanoryo at pidgin.im
Date:     05/01/11 23:42:24
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/fcd72ef630601a5c9de2e8465f3502ef38b67235

Changelog: 

propagate from branch 'im.pidgin.pidgin.mxit' (head 3d58b1f843fc2aebf9411756956d07ae96951623)
            to branch 'im.pidgin.pidgin' (head 68d280808dc7fafe82192c72f81929fa14b14b5c)

Changes against parent 3d58b1f843fc2aebf9411756956d07ae96951623

  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
  patched  AUTHORS
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  configure.ac
  patched  libpurple/account.c
  patched  libpurple/dnsquery.c
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  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/gg/gg.c
  patched  libpurple/protocols/gg/lib/message.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/jingleinfo.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/si.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  pidgin/gtkaccount.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/pixmaps/Makefile.am
  patched  pidgin/pixmaps/emotes/default/24/Makefile.am
  patched  pidgin/plugins/vvconfig.c
  patched  po/POTFILES.in

Changes against parent 68d280808dc7fafe82192c72f81929fa14b14b5c

  patched  ChangeLog
  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