soc.2009.webkitmessageview: 7be18cb8: merge of '1fce34e57b019434e9750dcf603d30...

darkrain42 at pidgin.im darkrain42 at pidgin.im
Sat Nov 7 20:17:27 EST 2009


-----------------------------------------------------------------
Revision: 7be18cb8139c12d8080e3e0603264c2a623a15d3
Ancestor: 1fce34e57b019434e9750dcf603d304c3e20959d
Ancestor: 5cdf9355ba7a6f7004193cbe87f5944ebb768dd8
Author: darkrain42 at pidgin.im
Date: 2009-11-08T01:12:44
Branch: im.pidgin.soc.2009.webkitmessageview
URL: http://d.pidgin.im/viewmtn/revision/info/7be18cb8139c12d8080e3e0603264c2a623a15d3

Added files:
        libpurple/tests/test_qq.c
        share/ca-certs/Entrust.net_Secure_Server_CA.pem
Modified files:
        AUTHORS COPYRIGHT ChangeLog ChangeLog.API ChangeLog.win32
        Makefile.am NEWS autogen.sh configure.ac doc/finch.1.in
        doc/pidgin.1.in finch/Makefile.am finch/gntaccount.c
        finch/gntblist.c finch/gntconv.c finch/libgnt/gntbindable.h
        finch/libgnt/gntbox.c finch/libgnt/gntcolors.c
        finch/libgnt/gntentry.c finch/libgnt/gntfilesel.c
        finch/libgnt/gntmain.c finch/libgnt/gnttextview.c
        finch/libgnt/gntutils.c finch/plugins/gnttinyurl.c
        libpurple/Makefile.am libpurple/account.c libpurple/blist.c
        libpurple/blist.h libpurple/certificate.c
        libpurple/connection.c libpurple/conversation.h
        libpurple/core.c libpurple/core.h libpurple/dbus-server.c
        libpurple/dnsquery.c libpurple/dnsquery.h libpurple/dnssrv.c
        libpurple/dnssrv.h libpurple/example/Makefile.am
        libpurple/ft.c libpurple/media-gst.h libpurple/media.c
        libpurple/media.h libpurple/mediamanager.h
        libpurple/plugins/perl/common/Prpl.xs
        libpurple/plugins/perl/common/XMLNode.xs
        libpurple/plugins/perl/perl.c
        libpurple/plugins/ssl/ssl-gnutls.c
        libpurple/protocols/irc/msgs.c
        libpurple/protocols/irc/parse.c
        libpurple/protocols/jabber/auth.c
        libpurple/protocols/jabber/bosh.c
        libpurple/protocols/jabber/buddy.c
        libpurple/protocols/jabber/caps.c
        libpurple/protocols/jabber/chat.c
        libpurple/protocols/jabber/chat.h
        libpurple/protocols/jabber/data.c
        libpurple/protocols/jabber/google.c
        libpurple/protocols/jabber/google.h
        libpurple/protocols/jabber/jabber.c
        libpurple/protocols/jabber/jingle/content.c
        libpurple/protocols/jabber/jingle/jingle.c
        libpurple/protocols/jabber/jutil.c
        libpurple/protocols/jabber/jutil.h
        libpurple/protocols/jabber/message.c
        libpurple/protocols/jabber/parser.c
        libpurple/protocols/jabber/presence.c
        libpurple/protocols/jabber/roster.c
        libpurple/protocols/msn/contact.c
        libpurple/protocols/msn/msn.c
        libpurple/protocols/msn/nexus.c
        libpurple/protocols/msn/notification.c
        libpurple/protocols/msn/oim.c
        libpurple/protocols/msn/servconn.c
        libpurple/protocols/msn/servconn.h
        libpurple/protocols/msn/slp.c
        libpurple/protocols/msn/switchboard.c
        libpurple/protocols/msn/transaction.c
        libpurple/protocols/msn/transaction.h
        libpurple/protocols/msn/user.c
        libpurple/protocols/oscar/clientlogin.c
        libpurple/protocols/oscar/family_auth.c
        libpurple/protocols/oscar/family_feedbag.c
        libpurple/protocols/oscar/family_icbm.c
        libpurple/protocols/oscar/family_locate.c
        libpurple/protocols/oscar/oscar.c
        libpurple/protocols/oscar/oscar.h
        libpurple/protocols/oscar/oscarcommon.h
        libpurple/protocols/qq/buddy_list.c
        libpurple/protocols/qq/buddy_opt.c
        libpurple/protocols/qq/file_trans.c
        libpurple/protocols/qq/group_im.c
        libpurple/protocols/qq/group_internal.c
        libpurple/protocols/qq/qq_base.c
        libpurple/protocols/qq/qq_crypt.c
        libpurple/protocols/qq/qq_network.c
        libpurple/protocols/qq/qq_process.c
        libpurple/protocols/qq/send_file.c
        libpurple/protocols/simple/Makefile.am
        libpurple/protocols/yahoo/libymsg.c
        libpurple/protocols/yahoo/libymsg.h
        libpurple/protocols/yahoo/util.c
        libpurple/protocols/yahoo/yahoo_filexfer.c
        libpurple/protocols/yahoo/yahoo_friend.c
        libpurple/protocols/yahoo/yahoo_friend.h libpurple/server.c
        libpurple/smiley.h libpurple/status.h
        libpurple/tests/Makefile.am
        libpurple/tests/check_libpurple.c
        libpurple/tests/test_jabber_jutil.c
        libpurple/tests/test_yahoo_util.c libpurple/tests/tests.h
        libpurple/theme-loader.c libpurple/theme-loader.h
        libpurple/theme.c libpurple/theme.h libpurple/util.c
        libpurple/util.h pidgin/Makefile.am pidgin/gtkblist.c
        pidgin/gtkconv.c pidgin/gtkdialogs.c pidgin/gtkimhtml.h
        pidgin/gtkimhtmltoolbar.c pidgin/gtkmain.c pidgin/gtkmedia.c
        pidgin/gtkprefs.c pidgin/gtksmiley.c pidgin/gtksound.c
        pidgin/gtkutils.c pidgin/pidginstock.c
        pidgin/pixmaps/emotes/default/24/default.theme.in
        pidgin/pixmaps/emotes/small/16/small.theme.in
        pidgin/plugins/adiumthemes/webkit.c
        pidgin/plugins/gestures/stroke.c
        pidgin/plugins/gevolution/eds-utils.c
        pidgin/plugins/gevolution/gevo-util.c
        pidgin/plugins/win32/winprefs/winprefs.c
        pidgin/plugins/xmppconsole.c
        pidgin/win32/nsis/pidgin-installer.nsi
        pidgin/win32/winpidgin.c pidgin.spec.in po/ChangeLog
        po/POTFILES.in po/af.po po/am.po po/ar.po po/az.po
        po/be at latin.po po/bg.po po/bn.po po/bs.po po/ca.po
        po/ca at valencia.po po/check_po.pl po/cs.po po/da.po po/de.po
        po/dz.po po/el.po po/en_AU.po po/en_CA.po po/en_GB.po
        po/eo.po po/es.po po/et.po po/eu.po po/fa.po po/fi.po
        po/fr.po po/ga.po po/gl.po po/gu.po po/he.po po/hi.po
        po/hu.po po/hy.po po/id.po po/it.po po/ja.po po/ka.po
        po/km.po po/kn.po po/ko.po po/ku.po po/lo.po po/lt.po
        po/mk.po po/mn.po po/my_MM.po po/nb.po po/ne.po po/nl.po
        po/nn.po po/oc.po po/pa.po po/pl.po po/ps.po po/pt.po
        po/pt_BR.po po/ro.po po/ru.po po/si.po po/sk.po po/sl.po
        po/sq.po po/sr.po po/sr at latin.po po/sv.po po/sw.po po/ta.po
        po/te.po po/th.po po/tr.po po/uk.po po/ur.po po/vi.po
        po/xh.po po/zh_CN.po po/zh_HK.po po/zh_TW.po
        share/ca-certs/Makefile.am

ChangeLog: 

merge of '1fce34e57b019434e9750dcf603d304c3e20959d'
     and '5cdf9355ba7a6f7004193cbe87f5944ebb768dd8'



More information about the Commits mailing list