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 /etc/tutorials/TUTORIAL | |
| 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 'etc/tutorials/TUTORIAL')
| -rw-r--r-- | etc/tutorials/TUTORIAL | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/tutorials/TUTORIAL b/etc/tutorials/TUTORIAL index 3f5f116648b..eb3acde9c01 100644 --- a/etc/tutorials/TUTORIAL +++ b/etc/tutorials/TUTORIAL | |||
| @@ -1116,7 +1116,7 @@ starting with the one written by Stuart Cracraft for the original Emacs. | |||
| 1116 | This version of the tutorial is a part of GNU Emacs. It is copyrighted | 1116 | This version of the tutorial is a part of GNU Emacs. It is copyrighted |
| 1117 | and comes with permission to distribute copies on certain conditions: | 1117 | and comes with permission to distribute copies on certain conditions: |
| 1118 | 1118 | ||
| 1119 | Copyright (C) 1985, 1996, 1998, 2001-2019 Free Software Foundation, | 1119 | Copyright (C) 1985, 1996, 1998, 2001-2020 Free Software Foundation, |
| 1120 | Inc. | 1120 | Inc. |
| 1121 | 1121 | ||
| 1122 | This file is part of GNU Emacs. | 1122 | This file is part of GNU Emacs. |