diff options
| author | Joakim Verona | 2013-08-17 19:31:47 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-17 19:31:47 +0200 |
| commit | 9b28ddca0d751a937382f269d274a902528ccfa4 (patch) | |
| tree | 4b15ae07ff3ae0ef9036fc31fceafc3aa25c9c24 /src/ChangeLog | |
| parent | e7a2af303596a96186af260a2b3cee24d4b4e4ed (diff) | |
| parent | d2c28fab135742b98466345f933c2f0c1608569c (diff) | |
| download | emacs-9b28ddca0d751a937382f269d274a902528ccfa4.tar.gz emacs-9b28ddca0d751a937382f269d274a902528ccfa4.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 013e181c406..7a875ae63bc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2013-08-17 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * decompress.c (Fzlib_available_p) [WINDOWSNT]: Update the value | ||
| 4 | of zlib_initialized according to the results of calling | ||
| 5 | init_zlib_functions. | ||
| 6 | |||
| 1 | 2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org> | 7 | 2013-08-16 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 8 | ||
| 3 | * image.c: Implement an ImageMagick per-image cache. | 9 | * image.c: Implement an ImageMagick per-image cache. |