pidgin.mxit: b1eec020: merge of '7d17d6b03c98b91ec1f90c5f17f7c9...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: b1eec0205e063fa73e7dfd94916a2e8c68a92922
Parent:   7d17d6b03c98b91ec1f90c5f17f7c923973f2e2c
Parent:   b013affa69881b165f9aa66f81f72e81a6163906
Author:   andrew.victor at mxit.com
Date:     08/22/11 02:55:20
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/b1eec0205e063fa73e7dfd94916a2e8c68a92922

Changelog: 

merge of '7d17d6b03c98b91ec1f90c5f17f7c923973f2e2c'
     and 'b013affa69881b165f9aa66f81f72e81a6163906'

Changes against parent 7d17d6b03c98b91ec1f90c5f17f7c923973f2e2c

  patched  ChangeLog

Changes against parent b013affa69881b165f9aa66f81f72e81a6163906

  dropped  gaim-uninstalled.pc.in
  dropped  gaim.pc.in
  dropped  libpurple/gaim-compat.h
  dropped  libpurple/purple-uninstalled.pc.in
  dropped  libpurple/purple.pc.in
  dropped  pidgin/gtkgaim-compat.h
  dropped  pidgin/pidgin-uninstalled.pc.in
  dropped  pidgin/pidgin.pc.in
  renamed  libpurple/purple-2-uninstalled.pc.in
       to  libpurple/purple-3-uninstalled.pc.in
  renamed  libpurple/purple-2.pc.in
       to  libpurple/purple-3.pc.in
  renamed  pidgin/pidgin-2-uninstalled.pc.in
       to  pidgin/pidgin-3-uninstalled.pc.in
  renamed  pidgin/pidgin-2.pc.in
       to  pidgin/pidgin-3.pc.in
  added    .tx
  added    .tx/config
  patched  .mtn-ignore
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  Makefile.am
  patched  configure.ac
  patched  finch/finch.c
  patched  finch/gntconn.c
  patched  finch/gntnotify.c
  patched  finch/gntprefs.c
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/blist.c
  patched  libpurple/buddyicon.c
  patched  libpurple/certificate.c
  patched  libpurple/connection.c
  patched  libpurple/connection.h
  patched  libpurple/core.c
  patched  libpurple/core.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/internal.h
  patched  libpurple/notify.c
  patched  libpurple/notify.h
  patched  libpurple/ntlm.c
  patched  libpurple/plugins/perl/common/Connection.xs
  patched  libpurple/plugins/perl/common/Status.xs
  patched  libpurple/plugins/tcl/tcl_cmds.c
  patched  libpurple/pounce.c
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/auth_plain.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/buddy.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/parser.c
  patched  libpurple/protocols/msn/httpconn.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/http.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/myspace/user.c
  patched  libpurple/protocols/novell/novell.c
  patched  libpurple/protocols/oscar/authorization.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/userinfo.c
  patched  libpurple/protocols/oscar/visibility.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/silc/ops.c
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/silc/util.c
  patched  libpurple/protocols/silc10/ops.c
  patched  libpurple/protocols/silc10/silc.c
  patched  libpurple/protocols/simple/simple.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoo_aliases.c
  patched  libpurple/protocols/yahoo/yahoo_packet.c
  patched  libpurple/protocols/yahoo/ycht.c
  patched  libpurple/protocols/zephyr/ZInit.c
  patched  libpurple/protocols/zephyr/Zinternal.c
  patched  libpurple/protocols/zephyr/zephyr.c
  patched  libpurple/request.c
  patched  libpurple/request.h
  patched  libpurple/savedstatuses.c
  patched  libpurple/status.c
  patched  libpurple/status.h
  patched  libpurple/stringref.c
  patched  libpurple/tests/test_util.c
  patched  libpurple/upnp.c
  patched  libpurple/util.c
  patched  libpurple/util.h
  patched  pidgin/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkblist.h
  patched  pidgin/gtkconn.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdialogs.h
  patched  pidgin/gtkimhtml.h
  patched  pidgin/gtkmain.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/gtkrequest.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/pidgin-3-uninstalled.pc.in
  patched  pidgin/pidgin-3.pc.in
  patched  pidgin/plugins/perl/common/GtkBlist.xs
  patched  pidgin/plugins/perl/common/GtkDialogs.xs
  patched  pidgin/plugins/relnot.c
  patched  po/ChangeLog
  patched  po/af.po
  patched  po/am.po
  patched  po/ar.po
  patched  po/as.po
  patched  po/az.po
  patched  po/be at latin.po
  patched  po/bg.po
  patched  po/bn.po
  patched  po/bn_IN.po
  patched  po/bs.po
  patched  po/cs.po
  patched  po/da.po
  patched  po/dz.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_CA.po
  patched  po/en_GB.po
  patched  po/eo.po
  patched  po/es.po
  patched  po/et.po
  patched  po/eu.po
  patched  po/fa.po
  patched  po/fi.po
  patched  po/fr.po
  patched  po/ga.po
  patched  po/gl.po
  patched  po/gu.po
  patched  po/he.po
  patched  po/hi.po
  patched  po/hr.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/id.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/ka.po
  patched  po/km.po
  patched  po/kn.po
  patched  po/ko.po
  patched  po/ku.po
  patched  po/lo.po
  patched  po/lt.po
  patched  po/mai.po
  patched  po/mhr.po
  patched  po/mk.po
  patched  po/ml.po
  patched  po/mn.po
  patched  po/mr.po
  patched  po/ms_MY.po
  patched  po/my_MM.po
  patched  po/nb.po
  patched  po/ne.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/oc.po
  patched  po/or.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ps.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/ro.po
  patched  po/ru.po
  patched  po/si.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/sq.po
  patched  po/sr.po
  patched  po/sr at latin.po
  patched  po/sv.po
  patched  po/sw.po
  patched  po/ta.po
  patched  po/te.po
  patched  po/th.po
  patched  po/tr.po
  patched  po/uk.po
  patched  po/ur.po
  patched  po/vi.po
  patched  po/xh.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po