aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.3
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /src/ChangeLog.3
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 'src/ChangeLog.3')
-rw-r--r--src/ChangeLog.32
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3
index 051c70f53e8..973251859c1 100644
--- a/src/ChangeLog.3
+++ b/src/ChangeLog.3
@@ -16503,7 +16503,7 @@ See ChangeLog.2 for earlier changes.
16503;; coding: utf-8 16503;; coding: utf-8
16504;; End: 16504;; End:
16505 16505
16506 Copyright (C) 1993, 2001-2019 Free Software Foundation, Inc. 16506 Copyright (C) 1993, 2001-2020 Free Software Foundation, Inc.
16507 16507
16508 This file is part of GNU Emacs. 16508 This file is part of GNU Emacs.
16509 16509