Merge branch 'tc/merge-m-log' into maint

diff --git a/.gitignore b/.gitignore
index 7b3acb766491e2e002f293cf9dd50298d0d7d83a..dbf1b90c63573b08efc894ed8c1e02de58fd53e4 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -155,7 +155,9 @@
 /git-write-tree
 /git-core-*/?*
 /gitk-git/gitk-wish
+/gitweb/GITWEB-BUILD-OPTIONS
 /gitweb/gitweb.cgi
+/gitweb/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date
@@ -177,7 +179,7 @@
 *.exe
 *.[aos]
 *.py[co]
-*.o.d
+.depend/
 *+
 /config.mak
 /autom4te.cache