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 /.gitignore | |
| 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 '.gitignore')
| -rw-r--r-- | .gitignore | 40 |
1 files changed, 35 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 16b92c427ae..4200d8a4963 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +**/Makefile +**/makefile + configure aclocal.m4 compile @@ -9,7 +12,6 @@ missing lib/Makefile.in src/config.in autom4te.cache -makefile TAGS *~ .#* @@ -24,7 +26,6 @@ info/dir info/*.info test/biditest.txt -Makefile config.log config.status config.cache @@ -72,9 +73,38 @@ src/stamp-h1 src/temacs src/temacs.map src/temacs.tmp -doc/emacs/emacsver.texi -doc/man/emacs.1 -etc/refcards/emacsver.tex +doc/*/*.aux +doc/*/*.cm +doc/*/*.cms +doc/*/*.cp +doc/*/*.cps +doc/*/*.dvi +doc/*/*.fn +doc/*/*.fns +doc/*/*.html +doc/*/*.ky +doc/*/*.kys +doc/*/*.log +doc/*/*.op +doc/*/*.ops +doc/*/*.pdf +doc/*/*.pg +doc/*/*.pgs +doc/*/*.pj +doc/*/*.pjs +doc/*/*.ps +doc/*/*.sc +doc/*/*.scs +doc/*/*.tg +doc/*/*.tgs +doc/*/*.tmp +doc/*/*.toc +doc/*/*.tp +doc/*/*.tps +doc/*/*.vr +doc/*/*.vrs +doc/*/texput.log +doc/misc/cc-mode.ss lib/.deps/ lisp/international/uni-brackets.el lwlib/deps/ |