diff options
| author | Joakim Verona | 2013-08-13 20:27:11 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 20:27:11 +0200 |
| commit | 527a4d099e6ad4a5615c28c3071757ad3a0dbf9a (patch) | |
| tree | f1df8ed821550d5e1e6670fbd44de0e52b46b63d /src/ChangeLog | |
| parent | f0a5c7bd7d1654efded1a93b71b662d815d18ef8 (diff) | |
| parent | cfa1f436cb9a6d78e77c9818c87572087e84b5fb (diff) | |
| download | emacs-527a4d099e6ad4a5615c28c3071757ad3a0dbf9a.tar.gz emacs-527a4d099e6ad4a5615c28c3071757ad3a0dbf9a.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 6d2c5722bdf..af76a0c3780 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2013-08-13 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * image.c (imagemagick_filename_hint): Check for errors in the | ||
| 4 | alist structure. | ||
| 5 | |||
| 1 | 2013-08-13 Eli Zaretskii <eliz@gnu.org> | 6 | 2013-08-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * window.c (Fwindow_margins): Return nil when there's no marginal | 8 | * window.c (Fwindow_margins): Return nil when there's no marginal |