diff options
| author | Joakim Verona | 2013-08-18 21:31:48 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-18 21:31:48 +0200 |
| commit | fd4e76c279715cbaa57465ea9ffbe68fb84d8299 (patch) | |
| tree | 81e2506023397c778c29cf1139d8f37159a29a17 /src/ChangeLog | |
| parent | a8761f8c13d9507250a7d95c687bb3999ca5ac11 (diff) | |
| parent | e2c904739e881006f70c9b491929bd4a3508c85d (diff) | |
| download | emacs-fd4e76c279715cbaa57465ea9ffbe68fb84d8299.tar.gz emacs-fd4e76c279715cbaa57465ea9ffbe68fb84d8299.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 671f6afc722..7ee41698bad 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * image.c (imagemagick_get_animation_cache): Don't segfault when | ||
| 4 | pruning all entries. | ||
| 5 | |||
| 1 | 2013-08-18 Ken Brown <kbrown@cornell.edu> | 6 | 2013-08-18 Ken Brown <kbrown@cornell.edu> |
| 2 | 7 | ||
| 3 | * sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger | 8 | * sheap.c (STATIC_HEAP_SIZE): Adjust to current needs; use bigger |