Mercurial > emacs
diff src/ChangeLog @ 112228:417b1e4d63cd
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 |
line wrap: on
line diff
--- a/src/ChangeLog Fri Jan 14 16:06:17 2011 +0100 +++ b/src/ChangeLog Fri Jan 14 12:18:41 2011 -0500 @@ -1,3 +1,9 @@ +2011-01-14 Eli Zaretskii <eliz@gnu.org> + + * image.c (png_jmpbuf): Remove definition. + (my_png_error, png_load): Don't use png_jmpbuf. + +2011-01-14 Eli Zaretskii <eliz@gnu.org> 2011-01-11 Tassilo Horn <tassilo@member.fsf.org> * image.c (imagemagick_load_image, Finit_image_library): Free @@ -29504,8 +29510,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2007, 2008, 2009, 2010, 2011 - Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. This file is part of GNU Emacs.