Merge branch 'lt/web'

diff --git a/.gitignore b/.gitignore
index fb0fa3f16a7c8a42c5d0d1be62666cc4ea4c6575..55cd9844d61e202670076968b20dcb0fda68732e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -125,6 +125,7 @@ git-verify-tag
 git-whatchanged
 git-write-tree
 git-core-*/?*
+gitweb/gitweb.cgi
 test-date
 test-delta
 test-dump-cache-tree
@@ -140,7 +141,7 @@ config.mak
 autom4te.cache
 config.log
 config.status
-config.mak.in
 config.mak.autogen
+config.mak.append
 configure
 git-blame