diff options
author | Ted Zlatanov <tzz@lifelogs.com> | 2014-11-26 21:31:11 -0500 |
---|---|---|
committer | Ted Zlatanov <tzz@lifelogs.com> | 2014-11-26 21:31:11 -0500 |
commit | ba4502fe1465f7803beca3ae187e41f0b25bef10 (patch) | |
tree | de8bdc219eeeba72e1a8b271ac96234c3c5af447 /doc/lispintro | |
parent | b121ef10f500c0377c2ce665e8ccd8b97a6aedfd (diff) | |
parent | 81e0cca7bbc99dbfda898a8aaab740ae121cf045 (diff) | |
download | emacs-ba4502fe1465f7803beca3ae187e41f0b25bef10.tar.gz |
Merge branch 'emacs-24'
Conflicts:
nt/addsection.c
nt/inc/ms-w32.h
src/w32.c
Diffstat (limited to 'doc/lispintro')
-rw-r--r-- | doc/lispintro/.gitignore | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/doc/lispintro/.gitignore b/doc/lispintro/.gitignore index e1af5a918b0..cf992dc8649 100644 --- a/doc/lispintro/.gitignore +++ b/doc/lispintro/.gitignore @@ -1,21 +1,3 @@ -*.aux -*.fn -*.fns -*.cps -*.cp -*.kys -*.ky -*.toc -*.pgs -*.pg -*.log -*.vrs -*.vr -*.dvi -*.ps -*.tp -*.tps -*.tmp -*.txt -Makefile -makefile +!cons-*.pdf +!drawers.pdf +!lambda-*.pdf |