adium.1-4: 6a027e41: explicit merge of '266042fff48838ac6672b...

[evands at pidgin.im]

----------------------------------------------------------------------
Revision: 6a027e41a13240f7b76e4f040795ac3c209133b1
Parent:   266042fff48838ac6672bcde8cf02babb5d5bae0
Parent:   31f9c5a59c5bc7ad45a0ddf236ad0b9dc03d5ccb
Author:   evands at pidgin.im
Date:     03/11/11 19:27:57
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/6a027e41a13240f7b76e4f040795ac3c209133b1

Changelog: 

explicit merge of '266042fff48838ac6672bcde8cf02babb5d5bae0'
              and '31f9c5a59c5bc7ad45a0ddf236ad0b9dc03d5ccb'

Changes against parent 266042fff48838ac6672bcde8cf02babb5d5bae0

  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
  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/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 31f9c5a59c5bc7ad45a0ddf236ad0b9dc03d5ccb

  added    libpurple/ciphers
  added    libpurple/ciphers/Makefile.am
  added    libpurple/ciphers/des.c
  added    libpurple/ciphers/gchecksum.c
  added    libpurple/ciphers/hmac.c
  added    libpurple/ciphers/md4.c
  added    libpurple/ciphers/md5.c
  added    libpurple/ciphers/rc4.c
  added    libpurple/ciphers/sha1.c
  added    libpurple/ciphers/sha256.c
  added    libpurple/protocols/mxit/voicevideo.c
  added    libpurple/protocols/mxit/voicevideo.h
  added    libpurple/tests/test_oscar_util.c
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  libpurple/Makefile.am
  patched  libpurple/Makefile.mingw
  patched  libpurple/account.h
  patched  libpurple/cipher.c
  patched  libpurple/cipher.h
  patched  libpurple/ft.c
  patched  libpurple/plugins/perl/common/Conversation.xs
  patched  libpurple/protocols/gg/lib/libgadu.h
  patched  libpurple/protocols/jabber/auth_scram.c
  patched  libpurple/protocols/jabber/bosh.c
  patched  libpurple/protocols/jabber/chat.c
  patched  libpurple/protocols/jabber/chat.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jutil.c
  patched  libpurple/protocols/jabber/message.c
  patched  libpurple/protocols/jabber/presence.c
  patched  libpurple/protocols/jabber/si.c
  patched  libpurple/protocols/msn/Makefile.mingw
  patched  libpurple/protocols/msn/contact.c
  patched  libpurple/protocols/msn/msn.c
  patched  libpurple/protocols/msn/msn.h
  patched  libpurple/protocols/msn/notification.c
  patched  libpurple/protocols/msn/p2p.c
  patched  libpurple/protocols/msn/p2p.h
  patched  libpurple/protocols/msn/session.c
  patched  libpurple/protocols/msn/slplink.c
  patched  libpurple/protocols/msn/slpmsg.c
  patched  libpurple/protocols/msn/slpmsg_part.c
  patched  libpurple/protocols/msn/state.c
  patched  libpurple/protocols/msn/switchboard.c
  patched  libpurple/protocols/msn/tlv.c
  patched  libpurple/protocols/msn/tlv.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/mxit/Makefile.am
  patched  libpurple/protocols/mxit/Makefile.mingw
  patched  libpurple/protocols/mxit/actions.c
  patched  libpurple/protocols/mxit/chunk.c
  patched  libpurple/protocols/mxit/chunk.h
  patched  libpurple/protocols/mxit/formcmds.c
  patched  libpurple/protocols/mxit/login.c
  patched  libpurple/protocols/mxit/mxit.c
  patched  libpurple/protocols/mxit/mxit.h
  patched  libpurple/protocols/mxit/profile.c
  patched  libpurple/protocols/mxit/protocol.c
  patched  libpurple/protocols/mxit/protocol.h
  patched  libpurple/protocols/mxit/roster.c
  patched  libpurple/protocols/mxit/roster.h
  patched  libpurple/protocols/myspace/myspace.c
  patched  libpurple/protocols/oscar/family_feedbag.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/silc/silc.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/tests/Makefile.am
  patched  libpurple/tests/check_libpurple.c
  patched  libpurple/tests/test_util.c
  patched  libpurple/tests/tests.h
  patched  pidgin/Makefile.am
  patched  pidgin/gtkblist.c
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkdocklet-gtk.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtknotify.c
  patched  po/ChangeLog
  patched  po/af.po
  patched  po/bn.po
  patched  po/cs.po
  patched  po/de.po
  patched  po/it.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/pl.po
  patched  po/ro.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/uk.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po