diff options
| author | Glenn Morris | 2014-11-09 23:39:35 -0800 |
|---|---|---|
| committer | Glenn Morris | 2014-11-09 23:39:35 -0800 |
| commit | c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe (patch) | |
| tree | 98a77f1acdac589d1be95dea128af1af7e8dc286 /admin/ChangeLog | |
| parent | eca1ea96559e04e18a62a61208d501c557dd4cab (diff) | |
| parent | edfdb22f674312389ccf5d5e37efa4d3f1516994 (diff) | |
| download | emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.tar.gz emacs-c832df2ec2f6528bc35f69f9fd9a4b2e470d2ebe.zip | |
Merge from emacs-24; up to 117698
Diffstat (limited to 'admin/ChangeLog')
| -rw-r--r-- | admin/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/admin/ChangeLog b/admin/ChangeLog index 17de5a49902..1c439504892 100644 --- a/admin/ChangeLog +++ b/admin/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-10 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * unidata/Makefile.in (${top_srcdir}/src/macuvs.h): Use | ||
| 4 | unmsys--file-name. (Bug#18955) | ||
| 5 | |||
| 1 | 2014-11-10 Glenn Morris <rgm@gnu.org> | 6 | 2014-11-10 Glenn Morris <rgm@gnu.org> |
| 2 | 7 | ||
| 3 | * admin.el (set-version): No need to update doc/man/emacs.1. | 8 | * admin.el (set-version): No need to update doc/man/emacs.1. |