view nt/.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 a927f31f34d5
children ef719132ddfa
line wrap: on
line source

config.log
stamp_BLD

oo/
oo-spd/

# arch-tag: a25a0376-d3d9-4b3e-a52a-7c3eac9fdba3