adium.1-4: dd5af287: propagate from branch 'im.pidgin.pidgin'...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: dd5af287dc9387c55f1967458d670e8e301de4e2
Parent:   7ae64aee05330df989a38704b4c7d53c01a2cff3
Parent:   b749d0705821b037f8e05755779d8a10c1b093c3
Author:   evands at pidgin.im
Date:     11/13/10 09:34:51
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/dd5af287dc9387c55f1967458d670e8e301de4e2

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head 7ae64aee05330df989a38704b4c7d53c01a2cff3)
            to branch 'im.pidgin.adium.1-4' (head b749d0705821b037f8e05755779d8a10c1b093c3)

Changes against parent 7ae64aee05330df989a38704b4c7d53c01a2cff3

  added    libpurple/protocols/facebook
  added    libpurple/protocols/facebook/COPYING
  added    libpurple/protocols/facebook/COPYRIGHT
  added    libpurple/protocols/facebook/Makefile.am
  added    libpurple/protocols/facebook/facebook.nsi
  added    libpurple/protocols/facebook/facebook16.png
  added    libpurple/protocols/facebook/facebook22.png
  added    libpurple/protocols/facebook/facebook48.png
  added    libpurple/protocols/facebook/fb_blist.c
  added    libpurple/protocols/facebook/fb_blist.h
  added    libpurple/protocols/facebook/fb_connection.c
  added    libpurple/protocols/facebook/fb_connection.h
  added    libpurple/protocols/facebook/fb_conversation.c
  added    libpurple/protocols/facebook/fb_conversation.h
  added    libpurple/protocols/facebook/fb_friendlist.c
  added    libpurple/protocols/facebook/fb_friendlist.h
  added    libpurple/protocols/facebook/fb_info.c
  added    libpurple/protocols/facebook/fb_info.h
  added    libpurple/protocols/facebook/fb_json.c
  added    libpurple/protocols/facebook/fb_json.h
  added    libpurple/protocols/facebook/fb_managefriends.c
  added    libpurple/protocols/facebook/fb_managefriends.h
  added    libpurple/protocols/facebook/fb_messages.c
  added    libpurple/protocols/facebook/fb_messages.h
  added    libpurple/protocols/facebook/fb_notifications.c
  added    libpurple/protocols/facebook/fb_notifications.h
  added    libpurple/protocols/facebook/fb_search.c
  added    libpurple/protocols/facebook/fb_search.h
  added    libpurple/protocols/facebook/fb_util.c
  added    libpurple/protocols/facebook/fb_util.h
  added    libpurple/protocols/facebook/libfacebook.c
  added    libpurple/protocols/facebook/libfacebook.h
  added    libpurple/protocols/facebook/login.facebook.com.pem
  added    libpurple/protocols/facebook/pidgin-facebookchat.rc
  added    libpurple/protocols/facebook/rss.xml
  added    libpurple/protocols/jabber/auth_fb.c
  added    libpurple/protocols/jabber/fbapi.c
  added    libpurple/protocols/jabber/fbapi.h
  patched  configure.ac
  patched  libpurple/Makefile.am
  patched  libpurple/account.c
  patched  libpurple/blist.c
  patched  libpurple/conversation.c
  patched  libpurple/conversation.h
  patched  libpurple/protocols/Makefile.am
  patched  libpurple/protocols/irc/irc.c
  patched  libpurple/protocols/irc/irc.h
  patched  libpurple/protocols/irc/msgs.c
  patched  libpurple/protocols/irc/parse.c
  patched  libpurple/protocols/jabber/Makefile.am
  patched  libpurple/protocols/jabber/auth.c
  patched  libpurple/protocols/jabber/auth.h
  patched  libpurple/protocols/jabber/auth_cyrus.c
  patched  libpurple/protocols/jabber/parser.c
  patched  libpurple/protocols/jabber/roster.c
  patched  libpurple/protocols/oscar/peer.c
  patched  po/POTFILES.in
  attr on  libpurple/protocols/facebook/facebook16.png
      set  mtn:manual_merge
       to  true
  attr on  libpurple/protocols/facebook/facebook22.png
      set  mtn:manual_merge
       to  true
  attr on  libpurple/protocols/facebook/facebook48.png
      set  mtn:manual_merge
       to  true
  attr on  libpurple/protocols/facebook/fb_util.c
      set  mtn:execute
       to  true
  attr on  libpurple/protocols/facebook/fb_util.h
      set  mtn:execute
       to  true

Changes against parent b749d0705821b037f8e05755779d8a10c1b093c3

  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/auth.c
  patched  libpurple/protocols/jabber/auth.h
  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
  patched  po/ro.po