diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-24 12:48:34 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-24 12:48:34 -0700 |
| commit | f7794460e8e9e0c514b0cb01dd010b531c21169c (patch) | |
| tree | 4bc195ab38f3e0e106b21b02d080be558ba80b33 /admin | |
| parent | e6d6a99455183bca5074b7601ad11d424da6442e (diff) | |
| parent | 78f9af707f711121ba24d8dce88d6757683a4dfe (diff) | |
Merge from origin/emacs-25
78f9af7 ; ChangeLog fixes
162e549 * admin/authors.el (authors-ignored-files): Additions.
2b31a0c In x_set_window_size restore do_pending_window_change calls
401857e Fix Alt-modified keys on some European MS-Windows keyboards
a77cf24 Document 'help-go-forward'
1ba947f Revert "Allow to customize names of executables used by grep.el"
570e0fa Revert "Don't use 'find-program'"
645f4ef Revert "Use 'grep-find-program' in check-declare.el"
aa03257 Clarify documentation of 'dired-mark-files-containing-regexp'
ce0d8c7 Make tmm-menubar work in correct order again
b8d5a8f Remove the Meta-CVS VC backend
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/admin/authors.el b/admin/authors.el index ecdd5ca774..f1aa2fa442 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -279,7 +279,7 @@ Changes to files matching one of the regexps in this list are not listed.") "ChangeLog.nextstep" "Emacs.clr" "spec.txt" "gfdl.1" "texi/Makefile.in" - "lwlib/autodeps.mk" + "autodeps.mk" "oldXMenu/autodeps.mk" "src/autodeps.mk" "Imakefile" "icons/sink.ico" "aixcc.lex" @@ -371,7 +371,7 @@ Changes to files matching one of the regexps in this list are not listed.") "lib/qset-acl.c" "lib/qcopy-acl.c" "lib/file-has-acl.c" ;; files from old MS Windows build procedures "makefile.w32-in" - "admin/unidata/makefile.w32-in" + "unidata/makefile.w32-in" "lib/makefile.w32-in" "leim/makefile.w32-in" "src/makefile.w32-in" @@ -691,7 +691,8 @@ Changes to files in this list are not listed.") "mh-exec.el" "mh-init.el" "mh-customize.el" "net/zone-mode.el" "xesam.el" "term/mac-win.el" "sup-mouse.el" - "term/vt102.el" "term/vt201.el" "term/vt220.el" "term/vt300.el" + "term/apollo.el" + "term/vt102.el" "term/vt125.el" "term/vt201.el" "term/vt220.el" "term/vt300.el" "term/vt320.el" "term/vt400.el" "term/vt420.el" "url-https.el" "org-mac-message.el" "org-mew.el" "org-w3m.el" "org-vm.el" "org-wl.el" |