summaryrefslogtreecommitdiff
path: root/nt
diff options
context:
space:
mode:
authorStefan Kangas <stefan@marxist.se>2022-01-02 06:31:44 +0100
committerStefan Kangas <stefan@marxist.se>2022-01-02 06:31:44 +0100
commitad125a99273c7bd81d02d388af3c69125dfe27ee (patch)
treebc693786881845334f6d3652d0ba613628e453b1 /nt
parent96212e1a270d9ba665bf33aec8a404979afb896b (diff)
parentefb1c7ec379430f560c5b801969ae43023c52734 (diff)
downloademacs-ad125a99273c7bd81d02d388af3c69125dfe27ee.tar.gz
Merge from origin/emacs-28
efb1c7ec37 ; * admin/notes/years: More known problems. f475c5823a ; Copyright year fixes 2684def348 ; Run set-copyright from admin.el 2558b37b5e ; * admin/notes/years: Mention known problems with 'update...
Diffstat (limited to 'nt')
-rwxr-xr-xnt/configure.bat2
-rw-r--r--nt/icons/README4
2 files changed, 3 insertions, 3 deletions
diff --git a/nt/configure.bat b/nt/configure.bat
index 0cb1a632e2b..60682a7a81d 100755
--- a/nt/configure.bat
+++ b/nt/configure.bat
@@ -1,7 +1,7 @@
@echo off
rem ----------------------------------------------------------------------
rem This was the old configuration script for MS Windows operating systems
-rem Copyright (C) 1999-2021 Free Software Foundation, Inc.
+rem Copyright (C) 1999-2022 Free Software Foundation, Inc.
rem This file is part of GNU Emacs.
diff --git a/nt/icons/README b/nt/icons/README
index 4006146d352..4d9fb15e520 100644
--- a/nt/icons/README
+++ b/nt/icons/README
@@ -8,7 +8,7 @@ License: GNU General Public License version 3 or later
File: emacs22.ico
Author: Andrew Zhilin
-Copyright (C) 2005-2021 Free Software Foundation, Inc.
+Copyright (C) 2005-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
@@ -17,7 +17,7 @@ Files: gnu2a32.ico gnu2a32t.ico gnu2b48.ico gnu2b48t.ico
gnu5w32.ico gnu5w32t.ico gnu6w48.ico gnu6w48t.ico
gnu7.ico gnu8.ico gnu9.ico
Author: Rob Davenport <rgd at bigfoot.com>
-Copyright (C) 1999, 2001-2021 Free Software Foundation, Inc.
+Copyright (C) 1999, 2001-2022 Free Software Foundation, Inc.
License: GNU General Public License version 3 or later (see COPYING)
<http://users.adelphia.net/~rob.davenport/gnuicons.html>