Merge from origin/emacs-24

[gnu-emacs] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 2d0df9de7e275887825cdd7d9ee3baf13aaab085..693b7adc711ae250e1bda2a1bc5ce42fc1bcc815 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,37 @@
+2014-12-26  Eli Zaretskii  <eliz@gnu.org>
+
+       * gnulib.mk (stpcpy, string): Sync with the latest change in
+       lib/gnulib.mk.
+
+2014-12-13  Eli Zaretskii  <eliz@gnu.org>
+
+       * gnulib.mk (stddef.h): Sync with the latest change in lib/gnulib.mk.
+
+2014-11-27  Oscar Fuentes  <ofv@wanadoo.es>
+
+       * inc/ms-w32.h: Define MINGW_W64.
+       * nt/addpm.c, nt/addsection.c, nt/preprep.c: Use it.
+
+2014-11-24  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (../src/emacs.res): New target.
+
+2014-11-22  Glenn Morris  <rgm@gnu.org>
+
+       * emacs.rc.in, emacsclient.rc.in: Rename from emacs.rc, emacsclient.rc.
+       Let configure generate the real files, and set the version numbers.
+       * Makefile.in (distclean): Delete *.rc.
+       (emacs.res): Update deps for nt/emacsclient.rc now being in the
+       build directory, not the source directory.
+
+       * Makefile.in (emacs.res): Add dependency on icons/hand.cur.
+
+2014-11-18  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (addpm${EXEEXT}, ddeclient${EXEEXT})
+       (cmdproxy${EXEEXT}, runemacs${EXEEXT}, emacs.res):
+       Use automatic variables.
+
 2014-10-26  Dani Moncayo <dmoncayo@gmail.com>
 
        * README.W32 (Preliminaries): Don't assume that this file is at
@@ -781,7 +815,7 @@
 2012-10-01  Eli Zaretskii  <eliz@gnu.org>
 
        * preprep.c (RVA_TO_PTR): Use 'unsigned char *' instead of
-       'void *', for pointer arithmetics.
+       'void *', for pointer arithmetic.
        (OFFSET_TO_RVA, RVA_TO_OFFSET, RVA_TO_SECTION_OFFSET): Enclose all
        macro arguments in parentheses.
 
@@ -1832,7 +1866,7 @@
        * config.nt (HAVE_FACES): Remove, unused.
 
 2008-06-26  Juanma Barranquero  <lekktu@gmail.com>
-            Eli Zaretskii  <eliz@gnu.org>
+           Eli Zaretskii  <eliz@gnu.org>
 
        * nmake.defs (FONT_CFLAGS):
        * gmake.defs (FONT_CFLAGS): Remove.
@@ -1848,7 +1882,7 @@
        * config.nt: Remove reference to UNEXEC_SRC.
 
 2008-06-23  Juanma Barranquero  <lekktu@gmail.com>
-            Eli Zaretskii  <eliz@gnu.org>
+           Eli Zaretskii  <eliz@gnu.org>
 
        * gmake.defs (DEBUG_FLAG, DEBUG_LINK) [!NODEBUG]:
        Don't hardcode -gstabs+, use DEBUG_INFO.