diff options
| author | Glenn Morris | 2011-05-04 21:00:38 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-04 21:00:38 -0700 |
| commit | f7ff1b0f0792f1f870778404531e68e77832c4a1 (patch) | |
| tree | 23cb550bdd3313df9b9b21a39a1a6c37c3258eec /src/ChangeLog | |
| parent | 9869b3ae6b4dc59d522f80b405250139e49cc9b9 (diff) | |
| parent | 9bb095f46e44b642d3420a5f3b8d1443dab1b016 (diff) | |
| download | emacs-f7ff1b0f0792f1f870778404531e68e77832c4a1.tar.gz emacs-f7ff1b0f0792f1f870778404531e68e77832c4a1.zip | |
Merge from emacs-23; up to 2010-06-10T05:17:21Z!rgm@gnu.org.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 6819a76f028..b6e30ab817c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2011-05-05 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * w32heap.c (allocate_heap) [USE_LISP_UNION_TYPE || USE_LSB_TAG]: | ||
| 4 | New version that can reserve upto 2GB of heap space. | ||
| 5 | |||
| 6 | 2011-05-05 Chong Yidong <cyd@stupidchicken.com> | ||
| 7 | |||
| 8 | * nsfns.m (Fns_read_file_name): Doc fix (Bug#8534). | ||
| 9 | |||
| 1 | 2011-05-05 Teodor Zlatanov <tzz@lifelogs.com> | 10 | 2011-05-05 Teodor Zlatanov <tzz@lifelogs.com> |
| 2 | 11 | ||
| 3 | * gnutls.c (fn_gnutls_certificate_set_x509_key_file): Add alias to | 12 | * gnutls.c (fn_gnutls_certificate_set_x509_key_file): Add alias to |