aboutsummaryrefslogtreecommitdiffstats
path: root/admin/notes
diff options
context:
space:
mode:
authorPaul Eggert2020-01-01 01:08:16 +0000
committerPaul Eggert2020-01-01 01:08:16 +0000
commitc6fb86b40bebf597fccbe4eba58ceea83bd9700f (patch)
treeab703ac6f4e85e6df08c467bc48cb7ae670f5ba9 /admin/notes
parent47f66e1aaf01d72e3b0db6eadbab378bfac96681 (diff)
parent186152ba400b58d2d278c52d2e3d896decae767e (diff)
downloademacs-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 'admin/notes')
-rw-r--r--admin/notes/copyright2
-rw-r--r--admin/notes/emba2
-rw-r--r--admin/notes/font-backend2
-rw-r--r--admin/notes/hydra2
-rw-r--r--admin/notes/multi-tty2
-rw-r--r--admin/notes/unicode2
-rw-r--r--admin/notes/www2
7 files changed, 7 insertions, 7 deletions
diff --git a/admin/notes/copyright b/admin/notes/copyright
index 5a0cf4d8d1f..156eec04cd6 100644
--- a/admin/notes/copyright
+++ b/admin/notes/copyright
@@ -1,4 +1,4 @@
1Copyright (C) 2007-2019 Free Software Foundation, Inc. 1Copyright (C) 2007-2020 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4
diff --git a/admin/notes/emba b/admin/notes/emba
index cb0dbc48095..76b0d3c5993 100644
--- a/admin/notes/emba
+++ b/admin/notes/emba
@@ -1,6 +1,6 @@
1-*- mode: outline; coding: utf-8 -*- 1-*- mode: outline; coding: utf-8 -*-
2 2
3Copyright (C) 2019 Free Software Foundation, Inc. 3Copyright (C) 2019-2020 Free Software Foundation, Inc.
4See the end of the file for license conditions. 4See the end of the file for license conditions.
5 5
6NOTES FOR EMACS CONTINUOUS BUILD ON EMBA 6NOTES FOR EMACS CONTINUOUS BUILD ON EMBA
diff --git a/admin/notes/font-backend b/admin/notes/font-backend
index eef7439bcc1..7572182a844 100644
--- a/admin/notes/font-backend
+++ b/admin/notes/font-backend
@@ -1,4 +1,4 @@
1Copyright (C) 2002-2019 Free Software Foundation, Inc. 1Copyright (C) 2002-2020 Free Software Foundation, Inc.
2See the end of the file for license conditions. 2See the end of the file for license conditions.
3 3
4 4
diff --git a/admin/notes/hydra b/admin/notes/hydra
index da8d98693ea..1b7d915c7a3 100644
--- a/admin/notes/hydra
+++ b/admin/notes/hydra
@@ -1,6 +1,6 @@
1-*- mode: outline; coding: utf-8 -*- 1-*- mode: outline; coding: utf-8 -*-
2 2
3Copyright (C) 2013-2019 Free Software Foundation, Inc. 3Copyright (C) 2013-2020 Free Software Foundation, Inc.
4See the end of the file for license conditions. 4See the end of the file for license conditions.
5 5
6NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA 6NOTES FOR EMACS CONTINUOUS BUILD ON HYDRA
diff --git a/admin/notes/multi-tty b/admin/notes/multi-tty
index e15a25b55ca..dee816ddb35 100644
--- a/admin/notes/multi-tty
+++ b/admin/notes/multi-tty
@@ -1,6 +1,6 @@
1-*- coding: utf-8; mode: text; -*- 1-*- coding: utf-8; mode: text; -*-
2 2
3Copyright (C) 2007-2019 Free Software Foundation, Inc. 3Copyright (C) 2007-2020 Free Software Foundation, Inc.
4See the end of the file for license conditions. 4See the end of the file for license conditions.
5 5
6From README.multi-tty in the multi-tty branch. 6From README.multi-tty in the multi-tty branch.
diff --git a/admin/notes/unicode b/admin/notes/unicode
index 30ca463bf21..6cb1b764c51 100644
--- a/admin/notes/unicode
+++ b/admin/notes/unicode
@@ -1,6 +1,6 @@
1 -*-mode: text; coding: utf-8;-*- 1 -*-mode: text; coding: utf-8;-*-
2 2
3Copyright (C) 2002-2019 Free Software Foundation, Inc. 3Copyright (C) 2002-2020 Free Software Foundation, Inc.
4See the end of the file for license conditions. 4See the end of the file for license conditions.
5 5
6Importing a new Unicode Standard version into Emacs 6Importing a new Unicode Standard version into Emacs
diff --git a/admin/notes/www b/admin/notes/www
index 9ff25cb20ac..cfc23ace017 100644
--- a/admin/notes/www
+++ b/admin/notes/www
@@ -1,6 +1,6 @@
1-*- outline -*- 1-*- outline -*-
2 2
3Copyright (C) 2013-2019 Free Software Foundation, Inc. 3Copyright (C) 2013-2020 Free Software Foundation, Inc.
4See the end of the file for license conditions. 4See the end of the file for license conditions.
5 5
6NOTES FOR EMACS WWW PAGES 6NOTES FOR EMACS WWW PAGES