Mercurial > emacs

view lisp/.gitignore @ 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 9a2d92bd2a3e
children
line wrap: on
line source

*.elc
*-loaddefs.el
loaddefs.el
subdirs.el
finder-inf.el
cus-load.el

# arch-tag: ab6e8f91-fb95-4efe-9c1b-68e21561e68a