diff options
| author | John Wiegley | 2016-03-03 23:53:38 -0800 |
|---|---|---|
| committer | John Wiegley | 2016-03-03 23:53:38 -0800 |
| commit | 17982e08d71bcb5b1d02d068ae1e6cc1903d6015 (patch) | |
| tree | 074bbbb29ae6e0419220938d92d056dd7b93bb1f /admin | |
| parent | 5c6cc95c9a56b19410e314c0d98d37cad87a9bd0 (diff) | |
| parent | d6f6b7db92bf15f18567ef746c0e23a0868643e7 (diff) | |
| download | emacs-17982e08d71bcb5b1d02d068ae1e6cc1903d6015.tar.gz emacs-17982e08d71bcb5b1d02d068ae1e6cc1903d6015.zip | |
Merge from origin/emacs-25
d6f6b7d * etc/AUTHORS: Update the AUTHORS file
5cf7c39 authors.el updates
a26f193 ; fix changelog entries
fbc85c7 ; make change-history-commit
06da00c Fix Bug#22859
ab30bf5 ; * src/w32proc.c: Update the commentary to sys_select.
1481029 Fix reordering of bidi text in an isolate inside an override
60e0596 Document c-guess-basic-syntax in the CC Mode manual.
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el index 9b3deef4f90..ecdd5ca7741 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -392,6 +392,7 @@ Changes to files matching one of the regexps in this list are not listed.") | |||
| 392 | "zipdist.bat" | 392 | "zipdist.bat" |
| 393 | "nt/makefile.w32-in" | 393 | "nt/makefile.w32-in" |
| 394 | "config.nt" | 394 | "config.nt" |
| 395 | "nextstep/WISHLIST" | ||
| 395 | ) | 396 | ) |
| 396 | "List of files and directories to ignore. | 397 | "List of files and directories to ignore. |
| 397 | Changes to files in this list are not listed.") | 398 | Changes to files in this list are not listed.") |