aboutsummaryrefslogtreecommitdiffstats
path: root/msdos/README
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /msdos/README
parent47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent186152ba400b58d2d278c52d2e3d896decae767e (diff)
downloademacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.tar.gz
emacs-c6fb86b40bebf597fccbe4eba58ceea83bd9700f.zip
Merge from origin/emacs-27
186152ba40 Pacify gcc -Wunused-function on Ubuntu 18.04.3 4cd143aded Fix copyright years by hand 365e01cc9f Update copyright year to 2020 cd2c156163 ; * etc/NEWS: Make the description of XDG fallback more ac... # Conflicts: # etc/NEWS # etc/refcards/ru-refcard.tex
Diffstat (limited to 'msdos/README')
-rw-r--r--msdos/README4
1 files changed, 2 insertions, 2 deletions
diff --git a/msdos/README b/msdos/README
index 75ae2c0634f..d1073741c67 100644
--- a/msdos/README
+++ b/msdos/README
@@ -1,4 +1,4 @@
1Copyright (C) 2001-2019 Free Software Foundation, Inc. 1Copyright (C) 2001-2020 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4
@@ -10,7 +10,7 @@ The files emacs.ico and emacs.pif are for using the DJGPP version on
10Windows 3.X. Since these are binary files, their copyright notice is 10Windows 3.X. Since these are binary files, their copyright notice is
11reproduced here: 11reproduced here:
12 12
13# Copyright (C) 1993, 2002-2019 Free Software Foundation, Inc. 13# Copyright (C) 1993, 2002-2020 Free Software Foundation, Inc.
14# 14#
15# This file is part of GNU Emacs. 15# This file is part of GNU Emacs.
16# 16#