summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2016-03-03 23:53:38 -0800
committerJohn Wiegley <johnw@newartisans.com>2016-03-03 23:53:38 -0800
commit17982e08d71bcb5b1d02d068ae1e6cc1903d6015 (patch)
tree074bbbb29ae6e0419220938d92d056dd7b93bb1f /admin
parent5c6cc95c9a56b19410e314c0d98d37cad87a9bd0 (diff)
parentd6f6b7db92bf15f18567ef746c0e23a0868643e7 (diff)
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.el1
1 files changed, 1 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el
index 9b3deef4f9..ecdd5ca774 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.")
"zipdist.bat"
"nt/makefile.w32-in"
"config.nt"
+ "nextstep/WISHLIST"
)
"List of files and directories to ignore.
Changes to files in this list are not listed.")