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/conf_post.h | |
| 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/conf_post.h')
| -rw-r--r-- | src/conf_post.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/conf_post.h b/src/conf_post.h index 43f98620a4b..2f8d19fdca8 100644 --- a/src/conf_post.h +++ b/src/conf_post.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | /* conf_post.h --- configure.ac includes this via AH_BOTTOM | 1 | /* conf_post.h --- configure.ac includes this via AH_BOTTOM |
| 2 | 2 | ||
| 3 | Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2019 Free Software | 3 | Copyright (C) 1988, 1993-1994, 1999-2002, 2004-2020 Free Software |
| 4 | Foundation, Inc. | 4 | Foundation, Inc. |
| 5 | 5 | ||
| 6 | This file is part of GNU Emacs. | 6 | This file is part of GNU Emacs. |