Mercurial > emacs
diff src/ChangeLog.2 @ 108952:7ffdaf7a645c
* 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 | 0eb2f9d5e474 |
children | e6408c088fbc |