Merge branch 'mr/gitweb-jsmin'

diff --git a/.gitignore b/.gitignore
index 8df8f88bea10e02371a41ca20420ee1607814dc8..4c2415276fe88677b9b33f9e40b30d3a43f89a33 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -156,6 +156,7 @@
 /git-core-*/?*
 /gitk-git/gitk-wish
 /gitweb/gitweb.cgi
+/gitweb/gitweb.min.*
 /test-chmtime
 /test-ctype
 /test-date
@@ -177,6 +178,7 @@
 *.exe
 *.[aos]
 *.py[co]
+*.o.d
 *+
 /config.mak
 /autom4te.cache