Merge from emacs-24; up to 2012-12-11T09:51:12Z!dmantipov@yandex.ru

[bpt/emacs.git] / msdos / ChangeLog

diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index 525868b..6575282 100644 (file)
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,36 @@
+2012-12-30  Eli Zaretskii  <eliz@gnu.org>
+
+       * sed1v2.inp (TEMACS_LDFLAGS2): Remove editing.
+       (LIBS_GNUSTEP): Edit to empty.
+
+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.
+
+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.
@@ -1452,7 +1485,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1994-1999, 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 1994-1999, 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.