aboutsummaryrefslogtreecommitdiffstats
path: root/admin/ChangeLog.1
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /admin/ChangeLog.1
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 'admin/ChangeLog.1')
-rw-r--r--admin/ChangeLog.12
1 files changed, 1 insertions, 1 deletions
diff --git a/admin/ChangeLog.1 b/admin/ChangeLog.1
index 6889407074c..3cbc9ebbd44 100644
--- a/admin/ChangeLog.1
+++ b/admin/ChangeLog.1
@@ -2577,7 +2577,7 @@
2577;; coding: utf-8 2577;; coding: utf-8
2578;; End: 2578;; End:
2579 2579
2580 Copyright (C) 2001-2019 Free Software Foundation, Inc. 2580 Copyright (C) 2001-2020 Free Software Foundation, Inc.
2581 2581
2582 This file is part of GNU Emacs. 2582 This file is part of GNU Emacs.
2583 2583