Mercurial > emacs
annotate lib-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 | 1823e414dc49 |
children | ef719132ddfa |
rev | line source |
---|---|
102380
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
diff
changeset
|
1 DOC |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
diff
changeset
|
2 ctags.c |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
diff
changeset
|
3 getopt.h |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
diff
changeset
|
4 stamp_BLD |
105614
1823e414dc49
* .gitignore: Add echolisp.tmp.
Juanma Barranquero <lekktu@gmail.com>
parents:
102391
diff
changeset
|
5 echolisp.tmp |
102380
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
diff
changeset
|
6 |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
diff
changeset
|
7 oo/ |
762408a9ef5d
Add .gitignore rules for in-place builds.
Juanma Barranquero <lekktu@gmail.com>
parents:
diff
changeset
|
8 oo-spd/ |
102391 | 9 |
10 # arch-tag: bcd85c02-f779-4fe6-bd45-97a21150aadc |