soc.2010.icq-tlc: 95cf4cb5: explicit merge of '92760ff5074d9bcc75f59...

[ivan.komarov at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 95cf4cb5f40dd40b28b2117b4e01692bce30ce13
Parent:   92760ff5074d9bcc75f59473f013ca8a959a85b8
Parent:   eadc83c534fbbc673a6876ddb1e0bdac8428c07b
Author:   ivan.komarov at soc.pidgin.im
Date:     07/28/10 20:06:56
Date:     07/28/10 20:07:04
Branch:   im.pidgin.soc.2010.icq-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/95cf4cb5f40dd40b28b2117b4e01692bce30ce13

Changelog: 

explicit merge of '92760ff5074d9bcc75f59473f013ca8a959a85b8'
              and 'eadc83c534fbbc673a6876ddb1e0bdac8428c07b'

Changes against parent 92760ff5074d9bcc75f59473f013ca8a959a85b8

  patched  libpurple/protocols/oscar/oscar.c

Changes against parent eadc83c534fbbc673a6876ddb1e0bdac8428c07b

  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/encoding.c
  added    libpurple/protocols/oscar/encoding.h
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/oscar/bstream.c
  patched  libpurple/protocols/oscar/family_admin.c
  patched  libpurple/protocols/oscar/family_auth.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/flap_connection.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/peer_proxy.c
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  libpurple/protocols/oscar/tlv.c
  patched  libpurple/protocols/oscar/userinfo.c
  patched  libpurple/protocols/oscar/util.c
  patched  libpurple/protocols/oscar/visibility.c