Merge from origin/emacs-24

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index d05352e712431ce9f7068863bc74674dea4e35a0..97adfb956107b447324ff21443a2bf2b91056381 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ makefile
 /confdefs.h
 /config.status
 /configure.lineno
+/conftest*
 src/config.h
 src/epaths.h