soc.2010.icq-tlc: 62d20fa6: merge of '67241dfb975ba5ce0811cc461f1716...

[markdoliner at pidgin.im]

----------------------------------------------------------------------
Revision: 62d20fa69e82c62b276adac211c3f839df49e21e
Parent:   67241dfb975ba5ce0811cc461f1716d28bf8b730
Parent:   eca3adf7cdd9217fcf670611fb705385fcfaa48d
Author:   markdoliner at pidgin.im
Date:     08/10/10 13:09:32
Branch:   im.pidgin.soc.2010.icq-tlc
URL: http://d.pidgin.im/viewmtn/revision/info/62d20fa69e82c62b276adac211c3f839df49e21e

Changelog: 

merge of '67241dfb975ba5ce0811cc461f1716d28bf8b730'
     and 'eca3adf7cdd9217fcf670611fb705385fcfaa48d'

Changes against parent 67241dfb975ba5ce0811cc461f1716d28bf8b730

  patched  libpurple/protocols/oscar/visibility.c

Changes against parent eca3adf7cdd9217fcf670611fb705385fcfaa48d

  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_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/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/snac.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