diff options
| author | Michael Albinus | 2014-12-19 12:48:49 +0100 |
|---|---|---|
| committer | Michael Albinus | 2014-12-19 12:48:49 +0100 |
| commit | 09ab6fedb2314ad1f6ef1cac8643e4b75d4798a2 (patch) | |
| tree | 60845d08beff4c498039c624029e1e135acfc161 /src/ChangeLog | |
| parent | 2616307f5c517124715b4d20bdd23c6c70366ac9 (diff) | |
| parent | a864bfb57c8445156dbe7e30b0348d9896c27b28 (diff) | |
| download | emacs-09ab6fedb2314ad1f6ef1cac8643e4b75d4798a2.tar.gz emacs-09ab6fedb2314ad1f6ef1cac8643e4b75d4798a2.zip | |
Merge branch 'emacs-24' of git.sv.gnu.org:/srv/git/emacs into emacs-24
Conflicts:
lisp/ChangeLog
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index c0b9039c339..d6de89a9d50 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2014-12-18 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * window.c (Fwindow_body_width): Doc fix. (Bug#19395) | ||
| 4 | |||
| 1 | 2014-12-15 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2014-12-15 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring. | 7 | * buffer.c (syms_of_buffer) <Vafter_change_functions>: fix docstring. |