Mercurial > emacs

comparison src/ChangeLog @ 112228:417b1e4d63cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents 3dff252e42ea 3fd4ea7be3a2
children 41f5a96a1e35
comparison
equal deleted inserted replaced
112227:07e52ed69b5d 112228:417b1e4d63cd
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>
1 2011-01-11 Tassilo Horn <tassilo@member.fsf.org> 7 2011-01-11 Tassilo Horn <tassilo@member.fsf.org>
2 8
3 * image.c (imagemagick_load_image, Finit_image_library): Free 9 * image.c (imagemagick_load_image, Finit_image_library): Free
4 intermediate image after creating a MagickWand from it. Terminate 10 intermediate image after creating a MagickWand from it. Terminate
5 MagickWand environment after image loading. 11 MagickWand environment after image loading.
29502 29508
29503 ;; Local Variables: 29509 ;; Local Variables:
29504 ;; coding: utf-8 29510 ;; coding: utf-8
29505 ;; End: 29511 ;; End:
29506 29512
29507 Copyright (C) 2007, 2008, 2009, 2010, 2011 29513 Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
29508 Free Software Foundation, Inc.
29509 29514
29510 This file is part of GNU Emacs. 29515 This file is part of GNU Emacs.
29511 29516
29512 GNU Emacs is free software: you can redistribute it and/or modify 29517 GNU Emacs is free software: you can redistribute it and/or modify
29513 it under the terms of the GNU General Public License as published by 29518 it under the terms of the GNU General Public License as published by