aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-12-16 18:42:58 -0800
committerPaul Eggert2014-12-16 18:43:27 -0800
commit8032fc16db7abacf6242356c5e168ea6f6cf36fa (patch)
tree9927d235504acc78ef84651a724679f3133b58a2
parentfb420e7789b4f9a0481ee44dbdf37d3de6578ad3 (diff)
downloademacs-8032fc16db7abacf6242356c5e168ea6f6cf36fa.tar.gz
emacs-8032fc16db7abacf6242356c5e168ea6f6cf36fa.zip
* .gitignore: Ignore /conftest*.
-rw-r--r--.gitignore1
-rw-r--r--ChangeLog4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3f1ac89f045..cbe13091b05 100644
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ makefile
48/confdefs.h 48/confdefs.h
49/config.status 49/config.status
50/configure.lineno 50/configure.lineno
51/conftest*
51src/config.h 52src/config.h
52src/epaths.h 53src/epaths.h
53 54
diff --git a/ChangeLog b/ChangeLog
index 34c1840a727..b6d0fcbb92d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-12-17 Paul Eggert <eggert@cs.ucla.edu>
2
3 * .gitignore: Ignore /conftest*.
4
12014-12-15 Stefan Monnier <monnier@iro.umontreal.ca> 52014-12-15 Stefan Monnier <monnier@iro.umontreal.ca>
2 6
3 * build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit 7 * build-aux/git-hooks/commit-msg (at_sign): Bump up line-length limit