Mercurial > emacs
diff lisp/buff-menu.el @ 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 | 1d1d5d9bd884 |
children | 280c8ae2476d 376148b31b5e |