diff options
| author | Miles Bader <miles@gnu.org> | 2006-12-07 04:14:14 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2006-12-07 04:14:14 +0000 |
| commit | a0451a715e4ed018a02b825d0eb823424693d1de (patch) | |
| tree | d2b10fcc69c333ccc438d7a9ad116fbc1495fc9e /.gitignore | |
| parent | d324f894beea8b485792c779659e8e20c1cb699d (diff) | |
| parent | 12f7728e938fe5bb850ce2928637d1e349919142 (diff) | |
| download | emacs-a0451a715e4ed018a02b825d0eb823424693d1de.tar.gz | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 523-544)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 168-171)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-150
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 6f0a84ff21c..0f9785cdfe7 100644 --- a/.gitignore +++ b/.gitignore @@ -38,5 +38,6 @@ config.cache Makefile emacs*.tar.gz leim*.tar.gz +lock *.xdelta autom4te.cache |