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

evands at pidgin.im evands at pidgin.im
Sun Oct 31 22:56:15 EDT 2010 

----------------------------------------------------------------------
Revision: 2cf653f0a15b26dd7936e8823786dcff52df3526
Parent:   cef4d764b52e204f7a8a38a75fc3d464dfce7ec9
Parent:   da2f4b4aea9c7f3e28c13f28b1ec087d4f589f25
Author:   evands at pidgin.im
Date:     10/31/10 22:49:15
Date:     10/31/10 22:50:57
Branch:   im.pidgin.adium
Branch:   im.pidgin.adium.1-4
URL: http://d.pidgin.im/viewmtn/revision/info/2cf653f0a15b26dd7936e8823786dcff52df3526

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head da2f4b4aea9c7f3e28c13f28b1ec087d4f589f25)
            to branch 'im.pidgin.adium.1-4' (head cef4d764b52e204f7a8a38a75fc3d464dfce7ec9)

Changelog: 

propagate from branch 'im.pidgin.pidgin' (head da2f4b4aea9c7f3e28c13f28b1ec087d4f589f25)
            to branch 'im.pidgin.adium' (head cef4d764b52e204f7a8a38a75fc3d464dfce7ec9)

Changes against parent cef4d764b52e204f7a8a38a75fc3d464dfce7ec9

  added    share/ca-certs/VeriSign_Class_3_Public_Primary_Certification_Authority_-_G2.pem
  patched  ChangeLog
  patched  ChangeLog.API
  patched  NEWS
  patched  configure.ac
  patched  libpurple/account.c
  patched  libpurple/connection.c
  patched  libpurple/protocols/bonjour/bonjour.c
  patched  libpurple/protocols/oscar/clientlogin.c
  patched  libpurple/protocols/oscar/family_chat.c
  patched  libpurple/protocols/oscar/family_icbm.c
  patched  libpurple/protocols/oscar/family_icq.c
  patched  libpurple/protocols/oscar/family_oservice.c
  patched  libpurple/protocols/oscar/flap_connection.c
  patched  libpurple/protocols/oscar/libaim.c
  patched  libpurple/protocols/oscar/libicq.c
  patched  libpurple/protocols/oscar/oscar.c
  patched  libpurple/protocols/oscar/oscar.h
  patched  libpurple/protocols/oscar/oscarcommon.h
  patched  libpurple/protocols/oscar/peer.c
  patched  libpurple/protocols/oscar/peer.h
  patched  libpurple/protocols/oscar/userinfo.c
  patched  pidgin/gtkaccount.c
  patched  pidgin/gtkdialogs.c
  patched  pidgin/minidialog.c
  patched  pidgin/plugins/win32/winprefs/winprefs.c
  patched  pidgin/win32/nsis/pidgin-installer.nsi
  patched  po/ChangeLog
  patched  po/af.po
  patched  po/am.po
  patched  po/ar.po
  patched  po/az.po
  patched  po/be at latin.po
  patched  po/bg.po
  patched  po/bn.po
  patched  po/bn_IN.po
  patched  po/bs.po
  patched  po/ca.po
  patched  po/ca at valencia.po
  patched  po/cs.po
  patched  po/da.po
  patched  po/de.po
  patched  po/dz.po
  patched  po/el.po
  patched  po/en_AU.po
  patched  po/en_CA.po
  patched  po/en_GB.po
  patched  po/eo.po
  patched  po/es.po
  patched  po/et.po
  patched  po/eu.po
  patched  po/fa.po
  patched  po/fi.po
  patched  po/fr.po
  patched  po/ga.po
  patched  po/gl.po
  patched  po/gu.po
  patched  po/he.po
  patched  po/hi.po
  patched  po/hu.po
  patched  po/hy.po
  patched  po/id.po
  patched  po/it.po
  patched  po/ja.po
  patched  po/ka.po
  patched  po/km.po
  patched  po/kn.po
  patched  po/ko.po
  patched  po/ku.po
  patched  po/lo.po
  patched  po/lt.po
  patched  po/mai.po
  patched  po/mk.po
  patched  po/mn.po
  patched  po/mr.po
  patched  po/ms_MY.po
  patched  po/my_MM.po
  patched  po/nb.po
  patched  po/ne.po
  patched  po/nl.po
  patched  po/nn.po
  patched  po/oc.po
  patched  po/or.po
  patched  po/pa.po
  patched  po/pl.po
  patched  po/ps.po
  patched  po/pt.po
  patched  po/pt_BR.po
  patched  po/ro.po
  patched  po/ru.po
  patched  po/si.po
  patched  po/sk.po
  patched  po/sl.po
  patched  po/sq.po
  patched  po/sr.po
  patched  po/sr at latin.po
  patched  po/stats.pl
  patched  po/sv.po
  patched  po/sw.po
  patched  po/ta.po
  patched  po/te.po
  patched  po/th.po
  patched  po/tr.po
  patched  po/uk.po
  patched  po/ur.po
  patched  po/vi.po
  patched  po/xh.po
  patched  po/zh_CN.po
  patched  po/zh_HK.po
  patched  po/zh_TW.po
  patched  share/ca-certs/Makefile.am

Changes against parent da2f4b4aea9c7f3e28c13f28b1ec087d4f589f25

  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

More information about the Commits mailing list