pidgin: 830fe530: merge of 'a05232ffa430529ccf3e31b0b20063...

[ivan.komarov at soc.pidgin.im]

----------------------------------------------------------------------
Revision: 830fe5304ea6ff4524d2f7d622341684d5a0e727
Parent:   a05232ffa430529ccf3e31b0b2006324a28ef9bd
Parent:   df86722dad2f9f8e11e9f107a7ff3abc05b98594
Author:   ivan.komarov at soc.pidgin.im
Date:     11/01/10 03:12:08
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/830fe5304ea6ff4524d2f7d622341684d5a0e727

Changelog: 

merge of 'a05232ffa430529ccf3e31b0b2006324a28ef9bd'
     and 'df86722dad2f9f8e11e9f107a7ff3abc05b98594'

Changes against parent a05232ffa430529ccf3e31b0b2006324a28ef9bd

  dropped  libpurple/protocols/msn/dialog.c
  dropped  libpurple/protocols/msn/dialog.h
  dropped  libpurple/protocols/msn/sync.c
  dropped  libpurple/protocols/msn/sync.h
  added    libpurple/protocols/msn/p2p.c
  added    libpurple/protocols/msn/p2p.h
  added    libpurple/protocols/msn/sbconn.c
  added    libpurple/protocols/msn/sbconn.h
  added    libpurple/protocols/msn/slpmsg_part.c
  added    libpurple/protocols/msn/slpmsg_part.h
  added    libpurple/protocols/msn/xfer.c
  added    libpurple/protocols/msn/xfer.h
  patched  ChangeLog
  patched  NEWS
  patched  libpurple/protocols/msn/Makefile.am
  patched  libpurple/protocols/msn/Makefile.mingw
  patched  libpurple/protocols/msn/cmdproc.c
  patched  libpurple/protocols/msn/cmdproc.h
  patched  libpurple/protocols/msn/command.c
  patched  libpurple/protocols/msn/command.h
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/directconn.c
  patched  libpurple/protocols/msn/directconn.h
  patched  libpurple/protocols/msn/error.c
  patched  libpurple/protocols/msn/error.h
  patched  libpurple/protocols/msn/group.h
  patched  libpurple/protocols/msn/history.h
  patched  libpurple/protocols/msn/httpconn.h
  patched  libpurple/protocols/msn/msg.c
  patched  libpurple/protocols/msn/msg.h
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/msnutils.c
  patched  libpurple/protocols/msn/msnutils.h
  patched  libpurple/protocols/msn/nexus.c
  patched  libpurple/protocols/msn/nexus.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/notification.h
  patched  libpurple/protocols/msn/object.c
  patched  libpurple/protocols/msn/object.h
  patched  libpurple/protocols/msn/oim.c
  patched  libpurple/protocols/msn/servconn.c
  patched  libpurple/protocols/msn/servconn.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/session.h
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/msn/slp.h
  patched  libpurple/protocols/msn/slpcall.c
  patched  libpurple/protocols/msn/slpcall.h
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slplink.h
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg.h
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/state.h
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/switchboard.h
  patched  libpurple/protocols/msn/table.h
  patched  libpurple/protocols/msn/transaction.c
  patched  libpurple/protocols/msn/transaction.h
  patched  libpurple/protocols/msn/user.c
  patched  libpurple/protocols/msn/user.h
  patched  libpurple/protocols/msn/userlist.c
  patched  libpurple/protocols/msn/userlist.h
  patched  po/POTFILES.in

Changes against parent df86722dad2f9f8e11e9f107a7ff3abc05b98594

  patched  libpurple/protocols/oscar/oscar.c