pidgin: 69fbc32f: merge of '833313a684a714d5138a37f30a635c...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 69fbc32fd3dfe8ca0979e1c486c3d51eb06088cf
Parent:   833313a684a714d5138a37f30a635c00044f3b93
Parent:   d54eb6748669c3887900b9d4c71e351e7281e41e
Author:   qulogic at pidgin.im
Date:     11/05/10 23:46:35
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/69fbc32fd3dfe8ca0979e1c486c3d51eb06088cf

Changelog: 

merge of '833313a684a714d5138a37f30a635c00044f3b93'
     and 'd54eb6748669c3887900b9d4c71e351e7281e41e'

Changes against parent 833313a684a714d5138a37f30a635c00044f3b93

  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/userlist.c

Changes against parent d54eb6748669c3887900b9d4c71e351e7281e41e

  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/plugins/themeedit-icon.c
  patched  pidgin/plugins/themeedit.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi