aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristoph Scholtes2014-11-15 14:11:06 -0700
committerChristoph Scholtes2014-11-15 14:13:59 -0700
commitb6cd03a825f7b8bdd0a741f68f20f81fb541ee5b (patch)
tree35697790a7d241d8fa7cd8ed59366850442da6cf
parent89ebffc1f60ead9b35c88663eadb345c3f569c3d (diff)
downloademacs-b6cd03a825f7b8bdd0a741f68f20f81fb541ee5b.tar.gz
emacs-b6cd03a825f7b8bdd0a741f68f20f81fb541ee5b.zip
Ignore generated file lib/stdalign.h.
-rw-r--r--.gitignore1
-rw-r--r--ChangeLog4
2 files changed, 5 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 3da59e302b6..d41b85d81f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,6 +57,7 @@ lib/libgnu.a
57lib/signal.h 57lib/signal.h
58lib/stdio.h 58lib/stdio.h
59lib/stdlib.h 59lib/stdlib.h
60lib/stdalign.h
60lib/string.h 61lib/string.h
61lib/sys/ 62lib/sys/
62lib/time.h 63lib/time.h
diff --git a/ChangeLog b/ChangeLog
index 0b0336ead5d..5ec81276d8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12014-11-15 Christoph Scholtes <cschol2112@gmail.com>
2
3 * .gitignore: Ignore generated file lib/stdalign.h.
4
12014-11-13 Paul Eggert <eggert@cs.ucla.edu> 52014-11-13 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Backport fix for minor Bazaar leftovers. 7 Backport fix for minor Bazaar leftovers.