diff options
| author | Joakim Verona | 2013-08-13 19:56:17 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 19:56:17 +0200 |
| commit | a218d7fbf59ed0896f02bf50ed1702c26696cd30 (patch) | |
| tree | b2236d22cd75ef70c021faa6d4525b408f14c9ea /src/ChangeLog | |
| parent | cf79cb9c1756f794b4f5c77b058d09e713f7b364 (diff) | |
| parent | 8259030d684cc11dcaf548a1aea29d7badf921fe (diff) | |
| download | emacs-a218d7fbf59ed0896f02bf50ed1702c26696cd30.tar.gz emacs-a218d7fbf59ed0896f02bf50ed1702c26696cd30.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 1cb8002ccf7..c60b2c19acf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * image.c (imagemagick_filename_hint): New function to possibly | ||
| 4 | apply `image-content-type-suffixes'. | ||
| 5 | (imagemagick_load_image): Use it. | ||
| 6 | |||
| 1 | 2013-08-13 Eli Zaretskii <eliz@gnu.org> | 7 | 2013-08-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 8 | ||
| 3 | * decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil | 9 | * decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil |