pidgin: 51f36133: merge of '3849acda3c84d7798c514bc1a9f80c...

[datallah at pidgin.im]

----------------------------------------------------------------------
Revision: 51f361332a107d980cc20d39578cfdc923b280ed
Parent:   3849acda3c84d7798c514bc1a9f80cca6674e52c
Parent:   c2c0e69d4f4081d4e5c60c2bab7b1a3e6d2f896a
Author:   datallah at pidgin.im
Date:     08/26/11 18:13:08
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/51f361332a107d980cc20d39578cfdc923b280ed

Changelog: 

merge of '3849acda3c84d7798c514bc1a9f80cca6674e52c'
     and 'c2c0e69d4f4081d4e5c60c2bab7b1a3e6d2f896a'

Changes against parent 3849acda3c84d7798c514bc1a9f80cca6674e52c

  patched  libpurple/win32/libc_interface.c
  patched  libpurple/win32/libc_interface.h
  patched  libpurple/win32/libc_internal.h

Changes against parent c2c0e69d4f4081d4e5c60c2bab7b1a3e6d2f896a

  patched  ChangeLog.API
  patched  finch/gntblist.c
  patched  finch/gntconv.c
  patched  finch/gntconv.h
  patched  finch/gntft.c
  patched  finch/gntrequest.c
  patched  finch/gntroomlist.c
  patched  finch/plugins/gntgf.c
  patched  finch/plugins/lastlog.c
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/ft.c
  patched  libpurple/ft.h
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/irc/dcc_send.c
  patched  libpurple/protocols/jabber/oob.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/xfer.c
  patched  libpurple/protocols/mxit/filexfer.c
  patched  libpurple/protocols/oscar/oft.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/sametime/sametime.c
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/roomlist.h
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkconv.h
  patched  pidgin/gtkft.c