adium, im.pidgin.adium.1-4: cef4d764: explicit merge of '2872bcba5019558c0d77e...

evands at pidgin.im evands at pidgin.im
Sun Oct 31 13:52:13 EDT 2010


----------------------------------------------------------------------
Revision: cef4d764b52e204f7a8a38a75fc3d464dfce7ec9
Parent:   2872bcba5019558c0d77e8cf9b43801167e5efc8
Parent:   dca487cd52fa87e4f31c9153a0ae63cebc3bbf79
Author:   evands at pidgin.im
Date:     10/31/10 13:46:26
Branch:   im.pidgin.adium
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/cef4d764b52e204f7a8a38a75fc3d464dfce7ec9

Changelog: 

explicit merge of '2872bcba5019558c0d77e8cf9b43801167e5efc8'
              and 'dca487cd52fa87e4f31c9153a0ae63cebc3bbf79'
        to branch 'im.pidgin.adium'

Changes against parent 2872bcba5019558c0d77e8cf9b43801167e5efc8

  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 dca487cd52fa87e4f31c9153a0ae63cebc3bbf79

  added    po/mai.po
  added    share/ca-certs/Deutsche_Telekom_Root_CA_2.pem
  added    share/ca-certs/Go_Daddy_Class_2_CA.pem
  added    share/ca-certs/Thawte_Primary_Root_CA.pem
  patched  AUTHORS
  patched  COPYRIGHT
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  doc/pidgin.1.in
  patched  libpurple/certificate.c
  patched  libpurple/dnssrv.c
  patched  libpurple/ft.c
  patched  libpurple/network.c
  patched  libpurple/ntlm.c
  patched  libpurple/plugins/idle.c
  patched  libpurple/plugins/perl/common/Util.xs
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/bonjour/bonjour.h
  patched  libpurple/protocols/bonjour/bonjour_ft.c
  patched  libpurple/protocols/bonjour/dns_sd_proxy.c
  patched  libpurple/protocols/bonjour/dns_sd_proxy.h
  patched  libpurple/protocols/bonjour/jabber.c
  patched  libpurple/protocols/bonjour/mdns_avahi.c
  patched  libpurple/protocols/bonjour/mdns_common.c
  patched  libpurple/protocols/bonjour/mdns_common.h
  patched  libpurple/protocols/bonjour/mdns_win32.c
  patched  libpurple/protocols/jabber/auth_digest_md5.c
  patched  libpurple/protocols/jabber/disco.c
  patched  libpurple/protocols/jabber/google/google_session.c
  patched  libpurple/protocols/jabber/google/google_session.h
  patched  libpurple/protocols/jabber/jabber.c
  patched  libpurple/protocols/jabber/jabber.h
  patched  libpurple/protocols/jabber/jingle/transport.c
  patched  libpurple/protocols/jabber/parser.c
  patched  libpurple/protocols/msn/slp.c
  patched  libpurple/protocols/myspace/message.c
  patched  libpurple/protocols/oscar/Makefile.am
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/oft.c
  patched  libpurple/protocols/oscar/visibility.c
  patched  libpurple/protocols/qq/file_trans.c
  patched  libpurple/protocols/qq/im.c
  patched  libpurple/protocols/yahoo/libymsg.c
  patched  libpurple/protocols/yahoo/libymsg.h
  patched  libpurple/protocols/yahoo/yahoo_filexfer.c
  patched  libpurple/purple-remote
  patched  libpurple/util.c
  patched  libpurple/win32/libc_interface.c
  patched  pidgin/Makefile.am
  patched  pidgin/gtkconv.c
  patched  pidgin/gtkdebug.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/gtkmain.c
  patched  pidgin/gtknotify.c
  patched  pidgin/gtkplugin.c
  patched  pidgin/gtkprefs.c
  patched  pidgin/win32/gtkwin32dep.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  pidgin/win32/wspell.c
  patched  po/ChangeLog
  patched  po/POTFILES.in
  patched  po/bn.po
  patched  po/cs.po
  patched  po/de.po
  patched  po/fr.po
  patched  po/he.po
  patched  po/hu.po
  patched  po/kn.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/pl.po
  patched  po/stats.pl
  patched  po/ta.po
  patched  po/uk.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po
  patched  share/ca-certs/Makefile.am



More information about the Commits mailing list