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 /nextstep | |
| 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 'nextstep')
| -rw-r--r-- | nextstep/ChangeLog.1 | 2 | ||||
| -rw-r--r-- | nextstep/INSTALL | 2 | ||||
| -rw-r--r-- | nextstep/Makefile.in | 2 | ||||
| -rw-r--r-- | nextstep/README | 2 | ||||
| -rw-r--r-- | nextstep/templates/Info.plist.in | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/nextstep/ChangeLog.1 b/nextstep/ChangeLog.1 index dbbe23f68b6..463705a66a8 100644 --- a/nextstep/ChangeLog.1 +++ b/nextstep/ChangeLog.1 | |||
| @@ -312,7 +312,7 @@ | |||
| 312 | ;; coding: utf-8 | 312 | ;; coding: utf-8 |
| 313 | ;; End: | 313 | ;; End: |
| 314 | 314 | ||
| 315 | Copyright (C) 2008-2019 Free Software Foundation, Inc. | 315 | Copyright (C) 2008-2020 Free Software Foundation, Inc. |
| 316 | 316 | ||
| 317 | This file is part of GNU Emacs. | 317 | This file is part of GNU Emacs. |
| 318 | 318 | ||
diff --git a/nextstep/INSTALL b/nextstep/INSTALL index f287eb77ffa..ac344196c8f 100644 --- a/nextstep/INSTALL +++ b/nextstep/INSTALL | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | Copyright (C) 2008-2019 Free Software Foundation, Inc. | 1 | Copyright (C) 2008-2020 Free Software Foundation, Inc. |
| 2 | See the end of the file for license conditions. | 2 | See the end of the file for license conditions. |
| 3 | 3 | ||
| 4 | 4 | ||
diff --git a/nextstep/Makefile.in b/nextstep/Makefile.in index 08e2e510d30..15e8bd9187b 100644 --- a/nextstep/Makefile.in +++ b/nextstep/Makefile.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ### @configure_input@ | 1 | ### @configure_input@ |
| 2 | 2 | ||
| 3 | ## Copyright (C) 2012-2019 Free Software Foundation, Inc. | 3 | ## Copyright (C) 2012-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ## This file is part of GNU Emacs. | 5 | ## This file is part of GNU Emacs. |
| 6 | 6 | ||
diff --git a/nextstep/README b/nextstep/README index 83e21e666e7..3ad226bfbe5 100644 --- a/nextstep/README +++ b/nextstep/README | |||
| @@ -105,7 +105,7 @@ future development. | |||
| 105 | 105 | ||
| 106 | 106 | ||
| 107 | ---------------------------------------------------------------------- | 107 | ---------------------------------------------------------------------- |
| 108 | Copyright 2008-2019 Free Software Foundation, Inc. | 108 | Copyright 2008-2020 Free Software Foundation, Inc. |
| 109 | 109 | ||
| 110 | This file is part of GNU Emacs. | 110 | This file is part of GNU Emacs. |
| 111 | 111 | ||
diff --git a/nextstep/templates/Info.plist.in b/nextstep/templates/Info.plist.in index 652cedf0562..f791ade7b97 100644 --- a/nextstep/templates/Info.plist.in +++ b/nextstep/templates/Info.plist.in | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | <?xml version="1.0" encoding="UTF-8"?> | 1 | <?xml version="1.0" encoding="UTF-8"?> |
| 2 | <!-- | 2 | <!-- |
| 3 | Copyright (C) 2008-2019 Free Software Foundation, Inc. | 3 | Copyright (C) 2008-2020 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | This file is part of GNU Emacs. | 5 | This file is part of GNU Emacs. |
| 6 | 6 | ||