diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:40:28 -0800 |
| commit | 9f2f14a0725211b13a744573344636b57b9c98b9 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /.gitignore | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-9f2f14a0725211b13a744573344636b57b9c98b9.tar.gz | |
Merge emacs-25 into master (using imerge)
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 682179150a3..e544b10808b 100644 --- a/.gitignore +++ b/.gitignore @@ -42,6 +42,7 @@ InfoPlist.strings Makefile makefile !etc/refcards/Makefile +!modules/mod-test/Makefile !test/lisp/progmodes/flymake-resources/Makefile !test/manual/indent/Makefile !test/manual/etags/Makefile @@ -139,6 +140,8 @@ src/stamp-h1 *.elc *.o *.res +*.so +*.dll [0-9]*.core core core.*[0-9] @@ -209,6 +212,7 @@ lisp/international/uni-*.el *.cms *.cp *.cps +*.doc *.dvi *.fn *.fns |