diff options
| author | Joakim Verona | 2013-08-16 17:22:23 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-16 17:22:23 +0200 |
| commit | 2bc8a1cc3cb8347f820d1c59319ee45fdb06c351 (patch) | |
| tree | f1a9de804a93785908db3034e7d6afe13d1ec116 /src/ChangeLog | |
| parent | bd2867f0787a5dc14da39859830c3d3024b1e117 (diff) | |
| parent | 4b5fe4ee092b847504023d3a471e1924c63f0155 (diff) | |
| download | emacs-2bc8a1cc3cb8347f820d1c59319ee45fdb06c351.tar.gz emacs-2bc8a1cc3cb8347f820d1c59319ee45fdb06c351.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d5c97748d1a..de9724238a0 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,6 +1,7 @@ | |||
| 1 | 2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * image.c: Implement an ImageMagick per-image cache. | 3 | * image.c: Implement an ImageMagick per-image cache. |
| 4 | (imagemagick_get_animation_cache): Fix a double-free error. | ||
| 4 | 5 | ||
| 5 | 2013-08-16 Xue Fuqiao <xfq.free@gmail.com> | 6 | 2013-08-16 Xue Fuqiao <xfq.free@gmail.com> |
| 6 | 7 | ||