diff options
| author | Joakim Verona | 2013-08-13 18:36:39 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 18:36:39 +0200 |
| commit | c5f293d04763b207b3bb1120230c10f8096dc232 (patch) | |
| tree | f2cb34e2c84676c1da3b8bf43544889b67a67b39 /src/ChangeLog | |
| parent | cb0b8a957cbf53f35179f571841c8cda2c276959 (diff) | |
| parent | 866c710eeb75ce47767442952028d79b76c1606a (diff) | |
| download | emacs-c5f293d04763b207b3bb1120230c10f8096dc232.tar.gz emacs-c5f293d04763b207b3bb1120230c10f8096dc232.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 70a1fa28db5..1cb8002ccf7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-13 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * decompress.c (Fzlib_decompress_region) [WINDOWSNT]: Return Qnil | ||
| 4 | if loading zlib failed. | ||
| 5 | |||
| 1 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> | 6 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 7 | ||
| 3 | * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by | 8 | * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by |