aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-05-02 09:28:03 -0700
committerGlenn Morris2012-05-02 09:28:03 -0700
commita64fe9146ef4d0c3966b76867f4ef97479e99477 (patch)
treefe3983e8a704844cfd5d89bf89b219aecd1e400a
parent3d6af4d1f67b07bb35b108fa43fb05083ef84d5e (diff)
downloademacs-a64fe9146ef4d0c3966b76867f4ef97479e99477.tar.gz
emacs-a64fe9146ef4d0c3966b76867f4ef97479e99477.zip
Yet more merged ChangeLog fixes
-rw-r--r--ChangeLog4
1 files changed, 0 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d30d3449f4..3b8af27e7f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,10 +14,6 @@
14 14
15 * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04. 15 * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.
16 16
17 * info/dir: Make some entries consistent with the source texi files.
18
19 * configure.in (LIBS_TERMCAP): Fix netbsd logic, broken 2012-03-04.
20
212012-05-02 Glenn Morris <rgm@gnu.org> 172012-05-02 Glenn Morris <rgm@gnu.org>
22 18
23 * Makefile.in (install-arch-indep): 19 * Makefile.in (install-arch-indep):