Mercurial > emacs
comparison src/ChangeLog @ 112229:41f5a96a1e35
ChangeLog merge fixes.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 14 Jan 2011 09:42:40 -0800 |
parents | 417b1e4d63cd |
children | cc0887b67703 17e0028efc29 |
comparison
equal
deleted
inserted
replaced
112228:417b1e4d63cd | 112229:41f5a96a1e35 |
---|---|
1 2011-01-14 Eli Zaretskii <eliz@gnu.org> | |
2 | |
3 * image.c (png_jmpbuf): Remove definition. | |
4 (my_png_error, png_load): Don't use png_jmpbuf. | |
5 | |
6 2011-01-14 Eli Zaretskii <eliz@gnu.org> | |
7 2011-01-11 Tassilo Horn <tassilo@member.fsf.org> | 1 2011-01-11 Tassilo Horn <tassilo@member.fsf.org> |
8 | 2 |
9 * image.c (imagemagick_load_image, Finit_image_library): Free | 3 * image.c (imagemagick_load_image, Finit_image_library): Free |
10 intermediate image after creating a MagickWand from it. Terminate | 4 intermediate image after creating a MagickWand from it. Terminate |
11 MagickWand environment after image loading. | 5 MagickWand environment after image loading. |