diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-01-01 07:03:03 -0500 |
| commit | dcd76bd48df678d8234b904d7b13c997228519a3 (patch) | |
| tree | 17b11e7d3aa1aa9d32d6be874cbbfb1e5882a2c5 /nextstep | |
| parent | 84a8f656d344cc69bce3a922b99182896a4e1285 (diff) | |
| parent | 836be7a112191cac8abd187e337c477ff5f05037 (diff) | |
| download | emacs-dcd76bd48df678d8234b904d7b13c997228519a3.tar.gz | |
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 'nextstep')
| -rw-r--r-- | nextstep/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | nextstep/INSTALL | 2 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 2 | ||||
| -rw-r--r-- | nextstep/README | 2 | ||||
| -rw-r--r-- | nextstep/templates/Info.plist.in | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1 index 8e7e2783ad1..86583d227e0 100644 --- a/nextstep/ChangeLog.1 +++ b/nextstep/ChangeLog.1 @@ -312,7 +312,7 @@ ;; coding: utf-8 ;; End: - Copyright (C) 2008-2021 Free Software Foundation, Inc. + Copyright (C) 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nextstep/INSTALL b/nextstep/INSTALL index 148be2d05c4..945d67faa47 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL @@ -1,4 +1,4 @@ -Copyright (C) 2008-2021 Free Software Foundation, Inc. +Copyright (C) 2008-2022 Free Software Foundation, Inc. See the end of the file for license conditions. diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 42b2ab2715d..92d7f28fe6b 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in @@ -1,6 +1,6 @@ ### @configure_input@ -## Copyright (C) 2012-2021 Free Software Foundation, Inc. +## Copyright (C) 2012-2022 Free Software Foundation, Inc. ## This file is part of GNU Emacs. diff --git a/nextstep/README b/nextstep/README index 141a5b21fe7..3ee437949c2 100644 --- a/nextstep/README +++ b/nextstep/README @@ -105,7 +105,7 @@ future development. ---------------------------------------------------------------------- -Copyright 2008-2021 Free Software Foundation, Inc. +Copyright 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in index f9f0ec08571..170db67c118 100644 --- a/nextstep/templates/Info.plist.in +++ b/nextstep/templates/Info.plist.in @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -Copyright (C) 2008-2021 Free Software Foundation, Inc. +Copyright (C) 2008-2022 Free Software Foundation, Inc. This file is part of GNU Emacs. |