aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert <[email protected]>2011-03-01 17:52:03 -0800
committerPaul Eggert <[email protected]>2011-03-01 17:52:03 -0800
commitba46f4d85a6938273f52a8cdf7e09d9afee61d7f (patch)
tree606ec46b703532d463ccddf287f0053430eb1f4a /ChangeLog
parentd9d0d182da35312ed0d7a9859b9c6a03994d86d8 (diff)
parent0dc3e4109e0c41bbf5fdcae0ff1156162719693e (diff)
Merge from mainline.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog14
1 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 8f439f369d..30262b6c5b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-02-26 Eli Zaretskii <[email protected]>
+
+ * .bzrignore: Ignore new lib/*.in-h files.
+
+ * config.bat: Rename stdint.in.h and sys_stat.in.h. Call
+ depfiles.bat even if lib/deps already exist.
+
2011-02-25 Paul Eggert <[email protected]>
Simplify symlink portability workaround.
@@ -7,7 +14,8 @@
* lib/dosname.h: New file, regenerated from gnulib.
* configure, lib/Makefile.in, lib/getopt_int.h, lib/gnulib.mk:
- * lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate.
+ * lib/stdlib.in.h, m4/stdlib_h.m4: Regenerate to incorporate
+ recent changes to configure.in and to gnulib.
2011-02-24 Glenn Morris <[email protected]>
@@ -7643,7 +7651,7 @@
* Makefile.in (lib-src/Makefile, src/Makefile, oldXMenu/Makefile):
Depend on vpath.sed.
- Replace sed comand for VPATH with @vpath_sed@.
+ Replace sed command for VPATH with @vpath_sed@.
* configure.in: Substitute variable `vpath_sed'.
If not in $srcdir and $srcdir is configured,
@@ -8984,7 +8992,7 @@
there, and then copy it in, to make sure we get a real file.
* make-dist: Don't try to distribute *.defns files any more. The
- only such file was for simula.el, which has been superceded by a
+ only such file was for simula.el, which has been superseded by a
version which doesn't have a separate .defns file.
1992-05-28 Ken Raeburn ([email protected])