Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 6819a76f02825b4f5a58c69342f36d7bcf1821ed..b6e30ab817c4b6b9140ef940c44ed03e30d479b3 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-05 Eli Zaretskii  <eliz@gnu.org>
+
+       * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]:
+       New version that can reserve upto 2GB of heap space.
+
+2011-05-05  Chong Yidong  <cyd@stupidchicken.com>
+
+       * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534).
+
 2011-05-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * gnutls.c (fn_gnutls_certificate_set_x509_key_file): Add alias to