diff options
| author | Eli Zaretskii | 2022-01-01 07:03:03 -0500 |
|---|---|---|
| committer | Eli Zaretskii | 2022-01-01 07:03:03 -0500 |
| commit | dcd76bd48df678d8234b904d7b13c997228519a3 (patch) | |
| tree | 17b11e7d3aa1aa9d32d6be874cbbfb1e5882a2c5 /admin/update_autogen | |
| parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
| parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
| download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz emacs-dcd76bd48df678d8234b904d7b13c997228519a3.zip | |
Merge from origin/emacs-28
836be7a112 ; * etc/refcards/ru-refcard.tex: Update Copyright year.
86cbc6ee4a * lisp/net/tramp-sh.el: Adapt copyright year
ebe8772f65 ; Minor fixes related to copyright years
23c1ee6989 ; * test/manual/etags/ETAGS.good_N: Adjust to copyright ye...
8d3fc7ec89 * src/xfaces.c (face_for_font): Make 'hash' be uintptr_t.
19dcb237b5 ; Add 2022 to copyright years.
# Conflicts:
# etc/NEWS
# etc/refcards/ru-refcard.tex
# lib/cdefs.h
# lisp/erc/erc-dcc.el
# lisp/erc/erc-imenu.el
# lisp/erc/erc-replace.el
# lisp/image-dired.el
# lisp/progmodes/xref.el
# m4/alloca.m4
# m4/byteswap.m4
# m4/errno_h.m4
# m4/getopt.m4
# m4/gnulib-common.m4
# m4/inttypes.m4
# m4/stddef_h.m4
# m4/stdint.m4
# m4/sys_socket_h.m4
Diffstat (limited to 'admin/update_autogen')
| -rwxr-xr-x | admin/update_autogen | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/update_autogen b/admin/update_autogen index 99297a9c0dc..bfbf9d15c24 100755 --- a/admin/update_autogen +++ b/admin/update_autogen | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #!/usr/bin/env bash | 1 | #!/usr/bin/env bash |
| 2 | ### update_autogen - update some auto-generated files in the Emacs tree | 2 | ### update_autogen - update some auto-generated files in the Emacs tree |
| 3 | 3 | ||
| 4 | ## Copyright (C) 2011-2021 Free Software Foundation, Inc. | 4 | ## Copyright (C) 2011-2022 Free Software Foundation, Inc. |
| 5 | 5 | ||
| 6 | ## Author: Glenn Morris <rgm@gnu.org> | 6 | ## Author: Glenn Morris <rgm@gnu.org> |
| 7 | ## Maintainer: emacs-devel@gnu.org | 7 | ## Maintainer: emacs-devel@gnu.org |