diff options
| author | Paul Eggert | 2020-01-01 01:08:16 +0000 |
|---|---|---|
| committer | Paul Eggert | 2020-01-01 01:08:16 +0000 |
| commit | c6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch) | |
| tree | ab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /src/ChangeLog.6 | |
| parent | 47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff) | |
| parent | 186152ba400b58d2d278c52d2e3d896decae767e (diff) | |
| download | emacs-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.6')
| -rw-r--r-- | src/ChangeLog.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.6 b/src/ChangeLog.6 index fdaa010375d..391d5fb8a52 100644 --- a/src/ChangeLog.6 +++ b/src/ChangeLog.6 | |||
| @@ -5358,7 +5358,7 @@ See ChangeLog.5 for earlier changes. | |||
| 5358 | ;; coding: utf-8 | 5358 | ;; coding: utf-8 |
| 5359 | ;; End: | 5359 | ;; End: |
| 5360 | 5360 | ||
| 5361 | Copyright (C) 1995-1996, 2001-2019 Free Software Foundation, Inc. | 5361 | Copyright (C) 1995-1996, 2001-2020 Free Software Foundation, Inc. |
| 5362 | 5362 | ||
| 5363 | This file is part of GNU Emacs. | 5363 | This file is part of GNU Emacs. |
| 5364 | 5364 | ||