Merge from emacs-24; up to 2012-11-24T16:58:43Z!cyd@gnu.org

[bpt/emacs.git] / msdos / ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 4d90e83..1fdd931 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,22 @@
+2012-12-03  Eli Zaretskii  <eliz@gnu.org>
+
+       * sed1v2.inp: Dump emacs.exe and copy to b-emacs.exe before
+       generating leim-list.el.
+
+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.