Merge changes from emacs-23 branch

[bpt/emacs.git] / nt / ChangeLog

diff --git a/nt/ChangeLog b/nt/ChangeLog
index eca36a0..dffae55 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,11 @@
+2011-01-02  Eli Zaretskii  <eliz@gnu.org>
+
+       * configure.bat (end): Unset environment variables used by this
+       batch file.
+
+       * INSTALL: Update the information about PNG support libraries.
+       (Bug#7716)
+
 2010-11-23  Eli Zaretskii  <eliz@gnu.org>
 
        * config.nt (EXTERNALLY_VISIBLE): Define.