diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:36:38 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-12-07 12:36:38 -0800 |
| commit | c26605861eab8499288dc83e3d80fd0e505b40fc (patch) | |
| tree | 24241eccc24d9159bded0c06a5a84b25dadbd328 /admin | |
| parent | 4ab7c308e073aa26973c5cdd17ec44bf5b325b57 (diff) | |
| parent | 3d63b488da6229bf85d28022f2b55ea6341d1805 (diff) | |
| download | emacs-c26605861eab8499288dc83e3d80fd0e505b40fc.tar.gz | |
Merge from origin/emacs-25
3d63b48 Update ChangeLog files and authors.el
9d30264 Fix menu bindings of Dired 'A' and 'Q' commands
a725592 Avoid errors in shr-pixel-column due to dedicated windows
3138598 Update format-time-string documentation
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/admin/authors.el b/admin/authors.el index 198a8e4d260..fe1b26ffbe6 100644 --- a/admin/authors.el +++ b/admin/authors.el @@ -855,6 +855,7 @@ in the repository.") ("emacs-lisp/assoc.el" . "assoc.el") ("emacs-lisp/cust-print.el" . "cust-print.el") ("emacs-lisp/gulp.el" . "gulp.el") + ("lisp/abbrevlist.el" . "abbrevlist.el") ("emulation/crisp.el" . "crisp.el") ("emulation/tpu-edt.el" . "tpu-edt.el") ("emulation/tpu-extras.el" . "tpu-extras.el") @@ -865,6 +866,7 @@ in the repository.") ("mail/mailpost.el" . "mailpost.el") ("net/eudcb-ph.el" . "eudcb-ph.el") ("play/bruce.el" . "bruce.el") + ("play/landmark.el" . "landmark.el") ("lisp/play/landmark.el" . "landmark.el") ("play/yow.el" . "yow.el") ("patcomp.el" . "patcomp.el") |