diff options
| author | Joakim Verona | 2013-08-19 06:36:32 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-19 06:36:32 +0200 |
| commit | c20b50ee18b5f9926d98fde1a4aa98ae78621d93 (patch) | |
| tree | f360d8019edbae2f4b750d2193280bf72193e697 /src/ChangeLog | |
| parent | 06e4beffef13e1fbc1d7c5f204aec9d240357e7f (diff) | |
| parent | deb31e75f8042f6f15d78e6695e849991d2b9e05 (diff) | |
| download | emacs-c20b50ee18b5f9926d98fde1a4aa98ae78621d93.tar.gz emacs-c20b50ee18b5f9926d98fde1a4aa98ae78621d93.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 7ee41698bad..0f68f36a8c9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-19 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * image.c (imagemagick_create_cache, imagemagick_get_animation_cache) | ||
| 4 | (imagemagick_prune_animation_cache): Now static. | ||
| 5 | |||
| 1 | 2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2013-08-18 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * image.c (imagemagick_get_animation_cache): Don't segfault when | 8 | * image.c (imagemagick_get_animation_cache): Don't segfault when |