Merge from origin/emacs-24

[gnu-emacs] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 2467e64bbef06f136392124318ced26d829efad8..b9966fb27d8cbf57f1f4798f4df949d12b2b54e2 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,12 @@
+2015-01-16  Eli Zaretskii  <eliz@gnu.org>
+
+       * Makefile.in (AM_V_CC, am__v_CC_, am__v_CC_0, am__v_CC_1)
+       (AM_V_CCLD, am__v_CCLD_, am__v_CCLD_0, am__v_CCLD_1, AM_V_RC)
+       (am__v_RC_, am__v_RC_0, am__v_RC_1): New macros.
+       (addpm${EXEEXT}, ddeclient${EXEEXT}, cmdproxy${EXEEXT})
+       (runemacs${EXEEXT}): Use $(AM_V_CCLD).
+       (emacs.res, ../src/emacs.res): Use $(AM_V_RC).
+
 2014-12-26  Eli Zaretskii  <eliz@gnu.org>
 
        * gnulib.mk (stpcpy, string): Sync with the latest change in
@@ -815,7 +824,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.
 
@@ -3515,7 +3524,7 @@
 ;; add-log-time-zone-rule: t
 ;; End:
 
-  Copyright (C) 1995-1999, 2001-2014 Free Software Foundation, Inc.
+  Copyright (C) 1995-1999, 2001-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.