pidgin.mxit: a4be36fc: propagate from branch 'im.pidgin.pidgin'...

[andrew.victor at mxit.com]

----------------------------------------------------------------------
Revision: a4be36fc9526cdb0891f825caf63ac1295f913eb
Parent:   240af8944798738f4310d3fcc8f2bc9ff33c2797
Parent:   d4d924811e4a96c620a632e02edaaaddd8b60820
Author:   andrew.victor at mxit.com
Date:     12/07/10 11:58:46
Branch:   im.pidgin.pidgin.mxit
URL: http://d.pidgin.im/viewmtn/revision/info/a4be36fc9526cdb0891f825caf63ac1295f913eb

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 240af8944798738f4310d3fcc8f2bc9ff33c2797)
            to branch 'im.pidgin.pidgin.mxit' (head d4d924811e4a96c620a632e02edaaaddd8b60820)

Changes against parent 240af8944798738f4310d3fcc8f2bc9ff33c2797

  patched  ChangeLog
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/mxit.c

Changes against parent d4d924811e4a96c620a632e02edaaaddd8b60820

  added    pidgin/pixmaps/protocols/16/facebook.png
  added    pidgin/pixmaps/protocols/22/facebook.png
  added    pidgin/pixmaps/protocols/48/facebook.png
  patched  ChangeLog
  patched  libpurple/protocols/jabber/jingle/jingle.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/contact.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkwhiteboard.c
  patched  pidgin/pixmaps/Makefile.am
  patched  pidgin/plugins/markerline.c
  attr on  pidgin/pixmaps/protocols/16/facebook.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/protocols/22/facebook.png
      set  mtn:manual_merge
       to  true
  attr on  pidgin/pixmaps/protocols/48/facebook.png
      set  mtn:manual_merge
       to  true