Merge from emacs-24; up to 2012-11-20T20:06:17Z!monnier@iro.umontreal.ca

[gnu-emacs] / msdos / ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 525868b2c70363ecff54fc3207a31319820a4119..753931ae0972998f07b5490ea12494e1f86c3c83 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,26 @@
+2012-11-24  Ken Brown  <kbrown@cornell.edu>
+
+       * sed2v2.inp (HAVE_MOUSE): Remove.
+
+2012-11-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * sedlibmk.inp: Sync with changes in lib/Makefile.in.
+       (HAVE_DECL_ENVIRON, GNULIB_ENVIRON): Edit to require declaration
+       through lib/unistd.h.
+
+       * sed1v2.inp: Sync with changes in src/Makefile.in.
+
+       * sed2v2.inp: Sync with changes in src/config.in.
+
+2012-10-08  Eli Zaretskii  <eliz@gnu.org>
+
+       * sed1v2.inp (W32_LIBS, W32_OBJ): Edit to empty.
+
+2012-10-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Merge from gnulib.
+       * msdos/sedlibmk.inp (REPLACE_PTSNAME): Edit to appropriate value.
+
 2012-09-27  Paul Eggert  <eggert@cs.ucla.edu>
 
        Check more robustly for timer_settime.