Merge from origin/emacs-24

[gnu-emacs] / admin / authors.el

diff --git a/admin/authors.el b/admin/authors.el
index afab6f0e1e804c728b66bf729440323b8031daf5..d214ff281b7af714d324288136c67d71b6684de3 100644 (file)
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -357,6 +357,7 @@ Changes to files matching one of the regexps in this list are not listed.")
     "All" "Version" "Everywhere" "Many" "Various" "files"
     ;; Directories.
     "vms" "mac" "url" "tree-widget"
+    "info/dir"
     )
   "List of files and directories to ignore.
 Changes to files in this list are not listed.")
@@ -796,6 +797,7 @@ in the repository.")
     ("play/bruce.el" . "bruce.el")
     ("play/yow.el" . "yow.el")
     ("patcomp.el" . "patcomp.el")
+    ("emulation/ws-mode.el" . "ws-mode.el")
     ;; From lisp to etc/forms.
     ("forms-d2.el" . "forms-d2.el")
     ("forms-pass.el" . "forms-pass.el")