Mercurial > emacs

diff lisp/org/org-icalendar.el @ 108952:7ffdaf7a645c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* lisp/net/rcirc.el (rcirc-server-alist, rcirc, rcirc-connect): Resolve merge conflict, giving preference to the emacs-23 version of the code.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Wed, 09 Jun 2010 21:10:04 -0400
parents 594e81986a75
children a150e8a14679
line wrap: on
line diff