1 files changed, 4 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 34c1840a727..b6d0fcbb92d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2014-12-17  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * .gitignore: Ignore /conftest*.
+
 2014-12-15  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit