diff options
| author | Glenn Morris | 2018-01-15 13:53:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2018-01-15 13:53:40 -0800 |
| commit | 6e141a2a1528c51494e90a3709172f52e010fc51 (patch) | |
| tree | 47f4b0abfd6432060c40a7e6e9efb13910b3b8f4 /admin | |
| parent | 5c6545d3d96c10a850a9d84b9b4dde4942d60d8e (diff) | |
| parent | c9c1add6a4df53e87418c27ccd6f4fbc41a42399 (diff) | |
| download | emacs-6e141a2a1528c51494e90a3709172f52e010fc51.tar.gz emacs-6e141a2a1528c51494e90a3709172f52e010fc51.zip | |
Merge from origin/emacs-26
c9c1add6a4 * doc/lispref/variables.texi (File Local Variables): Fix l...
752fba992b (tag: emacs-26.0.91) ; * Update ldefs-boot.el
4f46a5098d * ChangeLog.3: Update
8f705ba44d Update etc/AUTHORS
6c63204b8c Fix an entry in authors-aliases
5dd0e5c54d Mention trace.el facilities in the ELisp manual
97b0e41c5d Improve documentation of safe values of variables
a502ee9dc4 ; * doc/emacs/misc.texi (Amusements): Really add "games" t...
106bf8adc3 Improve the Emacs manual's "Misc" node
47aa85c7ec In nsterm.m use FRAME_NS_P instead of FRAME_X_P (Bug#30019)
e9e32d3475 ; * Update ldefs-boot.el
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/authors.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/authors.el b/admin/authors.el index 95d9ed16245..8c94014c575 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -130,7 +130,7 @@ files.") | |||
| 130 | ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo") | 130 | ("Agustín Martín" "Agustin Martin" "Agustín Martín Domingo") |
| 131 | ("Martin Lorentzon" "Martin Lorentzson") | 131 | ("Martin Lorentzon" "Martin Lorentzson") |
| 132 | ("Matt Swift" "Matthew Swift") | 132 | ("Matt Swift" "Matthew Swift") |
| 133 | (nil "Max") | 133 | (nil "mu@magi.net.ru") |
| 134 | ("Maxime Edouard Robert Froumentin" "Max Froumentin") | 134 | ("Maxime Edouard Robert Froumentin" "Max Froumentin") |
| 135 | ("Michael R. Mauger" "Michael Mauger") | 135 | ("Michael R. Mauger" "Michael Mauger") |
| 136 | ("Michael D. Ernst" "Michael Ernst") | 136 | ("Michael D. Ernst" "Michael Ernst") |