Mercurial > emacs
view src/.dbxinit @ 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 | 18e524802887 |
children |
line wrap: on
line source
ignore 14 catch 18 ignore 20 ignore 23 alias s step alias n next alias c cont alias st status alias r run alias l list alias f file alias q quit alias w where alias d delete alias p print