Mercurial > emacs
view src/.gitignore @ 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 | 579f88c6f33b |
children | ef719132ddfa |
line wrap: on
line source
buildobj.h config.h epaths.h stamp_BLD oo/ oo-spd/ # arch-tag: 0648c91e-6070-4cc5-a029-cade1f8b6098