Merge from mainline.

[bpt/emacs.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1155a1b..cfd77b6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
-2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
 
-       * lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
-       src/makefile.w32-in.
+       * lib/min-max.h: New file, for "min" and "max".
+
+2011-02-21  Christoph Scholtes  <cschol2112@gmail.com>
+
+       * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on
+       $(EMACS_ROOT)/nt/inc/stdint.h.
+
+2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+
+       * lib/makefile.w32-in ($(BLD)/filemode.$(O)): Move from
+       src/makefile.w32-in and adapt.  Depend on stamp_BLD.
+       (GNULIBOBJS): Add $(BLD)/filemode.$(O).
 
 2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
@@ -18,6 +28,26 @@
        * aclocal.m4, configure, lib/Makefile.in, lib/gnulib.mk, m4/gl-comp.m4:
        Regenerate.
 
+2011-02-20  Eli Zaretskii  <eliz@gnu.org>
+
+       * lib/makefile.w32-in ($(BLD)/md5.$(O)): Don't depend on
+       $(EMACS_ROOT)/nt/inc/sys/stat.h.
+
+2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * configure.in (C_WARNINGS_SWITCH): Do not prepend -Wno-pointer-sign.
+       This undoes the 2006-01-02 change.  The -Wno-pointer-sign option
+       is no longer needed, due to the recent SSDATA and related changes.
+       Perhaps -Wno-pointer-sign should also be removed from
+       nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj but I have no easy
+       way to test this so I left it alone.
+       * configure: Regenerate.
+
+2011-02-20  Christoph Scholtes <cschol2112@gmail.com>
+
+       * lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from
+       src/makefile.w32-in.
+
 2011-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
        Import crypto/md5 and stdint modules from gnulib.