Mercurial > emacs
comparison src/nsselect.m @ 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 | ad09f2bfce51 |
children | 8cfee7d2955f |
comparison
equal
deleted
inserted
replaced
108951:943435f93f92 | 108952:7ffdaf7a645c |
---|