cpw.qulogic.cairo: 96ccb79e: propagate from branch 'im.pidgin.pidgin'...

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 96ccb79efc205ff8fb4fe55818a50c0fdcbd76c6
Parent:   47179f04bde4a1cd3857fd05eb4e40f25ee9e26f
Parent:   c10b48bebcd04adcd6dad3d199fe09675a28219d
Author:   qulogic at pidgin.im
Date:     08/21/10 01:42:17
Branch:   im.pidgin.cpw.qulogic.cairo
URL: http://d.pidgin.im/viewmtn/revision/info/96ccb79efc205ff8fb4fe55818a50c0fdcbd76c6

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 47179f04bde4a1cd3857fd05eb4e40f25ee9e26f)
            to branch 'im.pidgin.cpw.qulogic.cairo' (head c10b48bebcd04adcd6dad3d199fe09675a28219d)

Changes against parent 47179f04bde4a1cd3857fd05eb4e40f25ee9e26f

  patched  pidgin/gtkimhtml.c
  patched  pidgin/gtkwhiteboard.c
  patched  pidgin/plugins/markerline.c

Changes against parent c10b48bebcd04adcd6dad3d199fe09675a28219d

  dropped  libpurple/protocols/oscar/family_advert.c
  dropped  libpurple/protocols/oscar/family_invite.c
  dropped  libpurple/protocols/oscar/family_odir.c
  dropped  libpurple/protocols/oscar/family_translate.c
  added    libpurple/protocols/oscar/authorization.c
  added    libpurple/protocols/oscar/encoding.c
  added    libpurple/protocols/oscar/encoding.h
  added    libpurple/protocols/oscar/userinfo.c
  added    libpurple/protocols/oscar/visibility.c
  added    libpurple/protocols/oscar/visibility.h
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  finch/libgnt/gntentry.c
  patched  finch/libgnt/gnttextview.c
  patched  libpurple/log.c
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/network.c
  patched  libpurple/plugins/tcl/tcl_cmd.c
  patched  libpurple/plugins/tcl/tcl_signals.c
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/oscar/Makefile.mingw
  patched  libpurple/protocols/oscar/bstream.c
  patched  libpurple/protocols/oscar/family_admin.c
  patched  libpurple/protocols/oscar/family_alert.c
  patched  libpurple/protocols/oscar/family_auth.c
  patched  libpurple/protocols/oscar/family_bart.c
  patched  libpurple/protocols/oscar/family_bos.c
  patched  libpurple/protocols/oscar/family_buddy.c
  patched  libpurple/protocols/oscar/family_chat.c
  patched  libpurple/protocols/oscar/family_chatnav.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/family_icq.c
  patched  libpurple/protocols/oscar/family_locate.c
  patched  libpurple/protocols/oscar/family_oservice.c
  patched  libpurple/protocols/oscar/family_userlookup.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/misc.c
  patched  libpurple/protocols/oscar/msgcookie.c
  patched  libpurple/protocols/oscar/odc.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/peer_proxy.c
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  libpurple/protocols/oscar/snac.c
  patched  libpurple/protocols/oscar/tlv.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/qq/char_conv.c
  patched  libpurple/protocols/qq/qq.c
  patched  libpurple/protocols/qq/qq_trans.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/yahoochat.c
  patched  libpurple/protocols/zephyr/ZVariables.c
  patched  libpurple/proxy.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkblist.c
  patched  pidgin/gtksourceundomanager.c
  patched  pidgin/gtkutils.c
  patched  pidgin/gtkutils.h
  patched  pidgin/minidialog.c
  patched  pidgin/minidialog.h
  patched  pidgin/pixmaps/pidgin.ico
  patched  pidgin/plugins/xmppconsole.c
  patched  po/ChangeLog
  patched  po/hu.po
  patched  po/uk.po