diff options
| author | Joakim Verona | 2013-08-18 19:52:01 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-18 19:52:01 +0200 |
| commit | a8761f8c13d9507250a7d95c687bb3999ca5ac11 (patch) | |
| tree | d562647979a005e803c655db9d16f750d5b1678b /src/ChangeLog | |
| parent | 9b28ddca0d751a937382f269d274a902528ccfa4 (diff) | |
| parent | f747d82e08b4d1201fa08cfee090759f7a6ef5b1 (diff) | |
| download | emacs-a8761f8c13d9507250a7d95c687bb3999ca5ac11.tar.gz emacs-a8761f8c13d9507250a7d95c687bb3999ca5ac11.zip | |
merge from trunk
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 7a875ae63bc..671f6afc722 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2013-08-18 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger | ||
| 4 | static heap if ENABLE_CHECKING is defined. | ||
| 5 | (max_bss_sbrk_ptr): New variable. | ||
| 6 | (bss_sbrk): Use it. | ||
| 7 | (report_sheap_usage): Report maximum static heap usage instead of | ||
| 8 | ending static heap usage. | ||
| 9 | |||
| 1 | 2013-08-17 Eli Zaretskii <eliz@gnu.org> | 10 | 2013-08-17 Eli Zaretskii <eliz@gnu.org> |
| 2 | 11 | ||
| 3 | * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value | 12 | * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value |