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 /lisp/ChangeLog.5 | |
| 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 'lisp/ChangeLog.5')
| -rw-r--r-- | lisp/ChangeLog.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.5 b/lisp/ChangeLog.5 index 4d762d517ec..cd092bde9e1 100644 --- a/lisp/ChangeLog.5 +++ b/lisp/ChangeLog.5 | |||
| @@ -9268,7 +9268,7 @@ See ChangeLog.4 for earlier changes. | |||
| 9268 | ;; coding: utf-8 | 9268 | ;; coding: utf-8 |
| 9269 | ;; End: | 9269 | ;; End: |
| 9270 | 9270 | ||
| 9271 | Copyright (C) 1994-1995, 2001-2019 Free Software Foundation, Inc. | 9271 | Copyright (C) 1994-1995, 2001-2020 Free Software Foundation, Inc. |
| 9272 | 9272 | ||
| 9273 | This file is part of GNU Emacs. | 9273 | This file is part of GNU Emacs. |
| 9274 | 9274 | ||