Migrate modules/.gitignore into .gitignore

* .gitignore: Add former contents of modules/.gitignore.
* modules/.gitignore: Remove.

diff --git a/.gitignore b/.gitignore
index fda50e9df77a011454610a43233eee816325892d..86e377eb0c07506e80e78e88fb505f5096c39092 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -42,6 +42,7 @@ InfoPlist.strings
 Makefile
 makefile
 !etc/refcards/Makefile
+!modules/mod-test/Makefile
 !test/automated/data/flymake/Makefile
 !test/indent/Makefile
 !test/etags/Makefile
@@ -139,6 +140,7 @@ src/stamp-h1
 *.elc
 *.o
 *.res
+*.so
 [0-9]*.core
 core
 core.*[0-9]
@@ -207,6 +209,7 @@ lisp/international/uni-*.el
 *.cms
 *.cp
 *.cps
+*.doc
 *.dvi
 *.fn
 *.fns

diff --git a/modules/.gitignore b/modules/.gitignore
deleted file mode 100644 (file)
index 33a872e..0000000
--- a/modules/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# built modules
-*.so
-
-# built DOCFILEs
-*.doc
-
-# include makefile for now
-!Makefile