aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2011-02-27 17:07:29 -0800
committerGlenn Morris2011-02-27 17:07:29 -0800
commit2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch)
treeb924eb1c22ab3bce643676162ef039f250782661 /ChangeLog
parentdf7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff)
parentd1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff)
downloademacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz
emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog4
1 files changed, 2 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 16bda0ecd2e..f7bef44ef55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7634,7 +7634,7 @@
7634 7634
7635 * Makefile.in (lib-src/Makefile, src/Makefile, oldXMenu/Makefile): 7635 * Makefile.in (lib-src/Makefile, src/Makefile, oldXMenu/Makefile):
7636 Depend on vpath.sed. 7636 Depend on vpath.sed.
7637 Replace sed comand for VPATH with @vpath_sed@. 7637 Replace sed command for VPATH with @vpath_sed@.
7638 7638
7639 * configure.in: Substitute variable `vpath_sed'. 7639 * configure.in: Substitute variable `vpath_sed'.
7640 If not in $srcdir and $srcdir is configured, 7640 If not in $srcdir and $srcdir is configured,
@@ -8975,7 +8975,7 @@
8975 there, and then copy it in, to make sure we get a real file. 8975 there, and then copy it in, to make sure we get a real file.
8976 8976
8977 * make-dist: Don't try to distribute *.defns files any more. The 8977 * make-dist: Don't try to distribute *.defns files any more. The
8978 only such file was for simula.el, which has been superceded by a 8978 only such file was for simula.el, which has been superseded by a
8979 version which doesn't have a separate .defns file. 8979 version which doesn't have a separate .defns file.
8980 8980
89811992-05-28 Ken Raeburn (Raeburn@Cygnus.COM) 89811992-05-28 Ken Raeburn (Raeburn@Cygnus.COM)