pidgin: 833313a6: merge of '2dfb64bc744cbdfa05ad4ebc9d940e...

Thu Nov 4 20:45:49 EDT 2010

----------------------------------------------------------------------
Revision: 833313a684a714d5138a37f30a635c00044f3b93
Parent:   2dfb64bc744cbdfa05ad4ebc9d940e9f078650ef
Parent:   a8840dd42182ddf786129279eef4a242de2fcd7b
Author:   ivan.komarov at soc.pidgin.im
Date:     11/04/10 20:38:46
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/833313a684a714d5138a37f30a635c00044f3b93

Changelog: 

merge of '2dfb64bc744cbdfa05ad4ebc9d940e9f078650ef'
     and 'a8840dd42182ddf786129279eef4a242de2fcd7b'

Changes against parent 2dfb64bc744cbdfa05ad4ebc9d940e9f078650ef

  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

Changes against parent a8840dd42182ddf786129279eef4a242de2fcd7b

  patched  libpurple/protocols/msn/switchboard.c
  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/plugins/themeedit-icon.c
  patched  pidgin/plugins/themeedit.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi