Merge from origin/emacs-24

[gnu-emacs] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index 28f5fd432d4ec319c1ed22faf154259a6a9ad5d7..693b7adc711ae250e1bda2a1bc5ce42fc1bcc815 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,12 @@
+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.
@@ -806,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.