Merge emacs-25 into master (using imerge)

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 682179150a330e796f02396c10c2582e1ef70afb..e544b10808b295d7f7b6e44cdf9a555b20b81ce2 100644 (file)
--- 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