pidgin: 8d870637: merge of '8459331448aff4ed1551775d833a55...

[rekkanoryo at pidgin.im]

----------------------------------------------------------------------
Revision: 8d8706378f97f57f9498f3f3e7a8e8acfaaa5c6f
Parent:   8459331448aff4ed1551775d833a55e5fde5f543
Parent:   ad42fb62961cca268fce0b985556099fafd6b7ea
Author:   rekkanoryo at pidgin.im
Date:     03/24/11 20:06:47
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/8d8706378f97f57f9498f3f3e7a8e8acfaaa5c6f

Changelog: 

merge of '8459331448aff4ed1551775d833a55e5fde5f543'
     and 'ad42fb62961cca268fce0b985556099fafd6b7ea'

Changes against parent 8459331448aff4ed1551775d833a55e5fde5f543

  added    libpurple/protocols/gg/lib/debug.c
  added    libpurple/protocols/gg/lib/encoding.c
  added    libpurple/protocols/gg/lib/encoding.h
  added    libpurple/protocols/gg/lib/handlers.c
  added    libpurple/protocols/gg/lib/libgadu-debug.h
  added    libpurple/protocols/gg/lib/message.c
  added    libpurple/protocols/gg/lib/message.h
  added    libpurple/protocols/gg/lib/session.h
  patched  ChangeLog
  patched  libpurple/media/backend-fs2.c
  patched  libpurple/protocols/gg/Makefile.am
  patched  libpurple/protocols/gg/Makefile.mingw
  patched  libpurple/protocols/gg/gg.c
  patched  libpurple/protocols/gg/lib/COPYING
  patched  libpurple/protocols/gg/lib/common.c
  patched  libpurple/protocols/gg/lib/dcc.c
  patched  libpurple/protocols/gg/lib/dcc7.c
  patched  libpurple/protocols/gg/lib/events.c
  patched  libpurple/protocols/gg/lib/http.c
  patched  libpurple/protocols/gg/lib/libgadu-internal.h
  patched  libpurple/protocols/gg/lib/libgadu.c
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/gg/lib/obsolete.c
  patched  libpurple/protocols/gg/lib/protocol.h
  patched  libpurple/protocols/gg/lib/pubdir50.c
  patched  libpurple/protocols/gg/lib/resolver.c
  patched  libpurple/protocols/gg/lib/resolver.h
  patched  libpurple/protocols/oscar/encoding.c
  patched  libpurple/protocols/oscar/userinfo.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkmedia.c
  patched  pidgin/plugins/vvconfig.c

Changes against parent ad42fb62961cca268fce0b985556099fafd6b7ea

  patched  ChangeLog.API
  patched  libpurple/dnsquery.h
  patched  libpurple/dnssrv.c
  patched  libpurple/dnssrv.h
  patched  libpurple/gaim-compat.h
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/simple/simple.h