adium.1-4: 241c0dfb: explicit merge of '9a32a30182d8a7b5baa40...

evands at pidgin.im evands at pidgin.im
Sun Nov 14 21:50:42 EST 2010


----------------------------------------------------------------------
Revision: 241c0dfb30b8d26fef38047807a31e939fb9423e
Parent:   9a32a30182d8a7b5baa400810eac0db2795cc0c4
Parent:   b749d0705821b037f8e05755779d8a10c1b093c3
Author:   evands at pidgin.im
Date:     11/14/10 21:42:43
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/241c0dfb30b8d26fef38047807a31e939fb9423e

Changelog: 

explicit merge of '9a32a30182d8a7b5baa400810eac0db2795cc0c4'
              and 'b749d0705821b037f8e05755779d8a10c1b093c3'

Changes against parent 9a32a30182d8a7b5baa400810eac0db2795cc0c4

  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

  patched  po/ro.po



More information about the Commits mailing list