diff options
| author | Joakim Verona | 2011-07-15 04:39:29 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-15 04:39:29 +0200 |
| commit | 4f616a2e7ed1db28da98df90266e9751a8ae9ee1 (patch) | |
| tree | 74a9dcbe13e945e712ae04a4a94c2202ca720591 /src/ChangeLog.9 | |
| parent | ff2be00005c3aeda6e11d7ed264ce86f02b60958 (diff) | |
| parent | ec2bc542a4d0127425625e8cb458684bd825675a (diff) | |
| download | emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.tar.gz emacs-4f616a2e7ed1db28da98df90266e9751a8ae9ee1.zip | |
merge from upstream
Diffstat (limited to 'src/ChangeLog.9')
| -rw-r--r-- | src/ChangeLog.9 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.9 b/src/ChangeLog.9 index 0c39de74a6a..f25434087c1 100644 --- a/src/ChangeLog.9 +++ b/src/ChangeLog.9 | |||
| @@ -5985,7 +5985,7 @@ | |||
| 5985 | GC_PROTECT_MALLOC_STATE]: New function. | 5985 | GC_PROTECT_MALLOC_STATE]: New function. |
| 5986 | (PROTECT_MALLOC_STATE): New macro. | 5986 | (PROTECT_MALLOC_STATE): New macro. |
| 5987 | (__malloc_initialize, morecore, _malloc_internal) | 5987 | (__malloc_initialize, morecore, _malloc_internal) |
| 5988 | (_free_internal) _realloc_internal): Use it to make _heapinfo | 5988 | (_free_internal, _realloc_internal): Use it to make _heapinfo |
| 5989 | read-only outside of gmalloc. | 5989 | read-only outside of gmalloc. |
| 5990 | 5990 | ||
| 5991 | * keymap.c: Update copyright. | 5991 | * keymap.c: Update copyright. |