adium.1-4: b11e221c: merge of '89aca070b8bd35bf6c4cfd5d5ae781...

evands at pidgin.im evands at pidgin.im
Sun Feb 20 20:36:59 EST 2011


----------------------------------------------------------------------
Revision: b11e221ca19d178589a72f537db6c9c2e8a998dc
Parent:   89aca070b8bd35bf6c4cfd5d5ae781c813f555f5
Parent:   98aa74ecc3567f056a133106c93654d19ad70f1d
Author:   evands at pidgin.im
Date:     02/20/11 12:32:20
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/b11e221ca19d178589a72f537db6c9c2e8a998dc

Changelog: 

merge of '89aca070b8bd35bf6c4cfd5d5ae781c813f555f5'
     and '98aa74ecc3567f056a133106c93654d19ad70f1d'

Changes against parent 89aca070b8bd35bf6c4cfd5d5ae781c813f555f5

  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  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  libpurple/account.c
  patched  libpurple/protocols/jabber/adhoccommands.c
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/jabber/presence.c
  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  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/encoding.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar_data.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/rxhandlers.c
  patched  libpurple/util.c
  patched  pidgin/plugins/Makefile.mingw
  patched  pidgin/plugins/themeedit-icon.c
  patched  pidgin/plugins/themeedit.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  pidgin/win32/untar.c
  patched  po/ChangeLog
  patched  po/POTFILES.in

Changes against parent 98aa74ecc3567f056a133106c93654d19ad70f1d

  dropped  libpurple/protocols/jabber/fbapi.c
  dropped  libpurple/protocols/jabber/fbapi.h
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth.h



More information about the Commits mailing list