summaryrefslogtreecommitdiff
path: root/.mailmap
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2024-02-24 06:35:16 -0500
committerEli Zaretskii <eliz@gnu.org>2024-02-24 06:35:16 -0500
commit229b3edb072de490f458cf986bf34bc1ffc87837 (patch)
treed148b6d64bbda32d2929f24b2f96b390f61a0248 /.mailmap
parenteeb89a5cb292bffe40ba7d0b0cf81f82f8452bf8 (diff)
parent01ebc95114fe89ef623bc7ebdd3c3e1b9ef06b4e (diff)
downloademacs-229b3edb072de490f458cf986bf34bc1ffc87837.tar.gz
Merge from origin/emacs-29
01ebc95114f Fix 'help-quick-toggle' afe49c7e2a2 ; * admin/authors.el (authors-aliases): Fix last change. 8b1f10f8cf4 ; Normalize Morgan Smith's attributions. 70cf4b694b3 ; * etc/PROBLEMS: Describe input lags due to GTK IM (bug#... f28a557c7d4 * doc/lispref/modes.texi (Tabulated List Mode): Update. d6131b5902a * lisp/net/tramp.el (tramp-methods): Fix typo in docstrin... 2eb85a9de1a ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Ano... 4c6653f23ae ; * lisp/emacs-lisp/pcase.el (pcase-let*, pcase-let): Doc... 5a64d2c7595 java-ts-mode: Indentation for opening brace on a separate... 9e56bd5ed87 Removed decommissioned PGP keyservers e56f0ef51bf org: Fix security prompt for downloading remote resource 65ba3274652 Revert "Update to Org 9.6.19" 07a392f445e Update to Org 9.6.19
Diffstat (limited to '.mailmap')
-rw-r--r--.mailmap2
1 files changed, 1 insertions, 1 deletions
diff --git a/.mailmap b/.mailmap
index 5e6ab5b8878..7c474fcdaf6 100644
--- a/.mailmap
+++ b/.mailmap
@@ -129,7 +129,7 @@ Maxim Nikulin <manikulin@gmail.com>
Michael Albinus <michael.albinus@gmx.de> <albinus@detlef>
Michalis V <mvar.40k@gmail.com>
Miha Rihtaršič <miha@kamnitnik.top>
-Morgan J. Smith <Morgan.J.Smith@outlook.com>
+Morgan Smith <Morgan.J.Smith@outlook.com>
Nick Drozd <nicholasdrozd@gmail.com>
Nicolas Petton <nicolas@petton.fr> <petton.nicolas@gmail.com>
Nitish Chandra <nitishchandrachinta@gmail.com>