diff options
| author | Glenn Morris | 2011-01-14 09:42:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-14 09:42:40 -0800 |
| commit | 15a1cca8ecc4b5a7330f377e608a34552fc9fc0a (patch) | |
| tree | 5a221e5aae726c74e1b9d019571c8c6c91914f65 /src | |
| parent | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (diff) | |
| download | emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.tar.gz emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.zip | |
ChangeLog merge fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f473da74811..4d2aa00cbd3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,9 +1,3 @@ | |||
| 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 |