Merge branch 'jn/conf'

diff --git a/.gitignore b/.gitignore
index fb0fa3f16a7c8a42c5d0d1be62666cc4ea4c6575..6e973b3d4bd107fb77df6b9394b87a7b79d96e0e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -140,7 +140,7 @@ config.mak
 autom4te.cache
 config.log
 config.status
-config.mak.in
 config.mak.autogen
+config.mak.append
 configure
 git-blame