diff options
| author | Joakim Verona | 2013-08-19 20:11:40 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-19 20:11:40 +0200 |
| commit | 0c1b014bcd625bb88708aff3c7d401aa3b88fa07 (patch) | |
| tree | 23865ef720a133f4b1402b50509ecd3b799f48d1 /src/ChangeLog | |
| parent | db3552accac421806591cb6b189f093e8f7c5f47 (diff) | |
| parent | 453f40228f8ff3d43665f5bf008b117bf9b9a7dc (diff) | |
| download | emacs-0c1b014bcd625bb88708aff3c7d401aa3b88fa07.tar.gz emacs-0c1b014bcd625bb88708aff3c7d401aa3b88fa07.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 716b1177fd1..2171f2b8748 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -2,6 +2,9 @@ | |||
| 2 | 2 | ||
| 3 | * image.c (imagemagick_get_animation_cache): Don't segfault on | 3 | * image.c (imagemagick_get_animation_cache): Don't segfault on |
| 4 | each invocation. | 4 | each invocation. |
| 5 | (imagemagick_get_animation_cache): Revert to previous definition | ||
| 6 | so that it actually works. But keep the memory leak fix. | ||
| 7 | (imagemagick_get_animation_cache): Fix memory leak. | ||
| 5 | 8 | ||
| 6 | 2013-08-19 Paul Eggert <eggert@cs.ucla.edu> | 9 | 2013-08-19 Paul Eggert <eggert@cs.ucla.edu> |
| 7 | 10 | ||