[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 517b0aa 2/7: Merge from origin/emacs-26
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] master 517b0aa 2/7: Merge from origin/emacs-26 |
Date: |
Mon, 7 Jan 2019 14:51:50 -0500 (EST) |
branch: master
commit 517b0aa46663b6173bb31a018aee18a82f2ca1d9
Merge: 67b90b5 5f2aa32
Author: Glenn Morris <address@hidden>
Commit: Glenn Morris <address@hidden>
Merge from origin/emacs-26
5f2aa32 Update Unicode copyright notice
---
admin/unidata/copyright.html | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/admin/unidata/copyright.html b/admin/unidata/copyright.html
index 0df59c1..84322c8 100644
--- a/admin/unidata/copyright.html
+++ b/admin/unidata/copyright.html
@@ -131,7 +131,7 @@ pre {
<ol type="A">
<li><u><a name="1"></a>Unicode Copyright.</u>
<ol>
- <li>Copyright © 1991-2018 Unicode, Inc. All rights
reserved.</li>
+ <li>Copyright © 1991-2019 Unicode, Inc. All rights
reserved.</li>
<li>Certain documents and files on this website contain a
legend
indicating that "Modification is permitted." Any
person is
hereby authorized, without fee, to modify such documents and
@@ -250,7 +250,8 @@ pre {
<pre>
Unicode Data Files include all data files under the directories
http://www.unicode.org/Public/, http://www.unicode.org/reports/,
-http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
and
+http://www.unicode.org/cldr/data/, http://source.icu-project.org/repos/icu/,
+http://www.unicode.org/ivd/data/, and
http://www.unicode.org/utility/trac/browser/.
Unicode Data Files do not include PDF online code charts under the
@@ -272,7 +273,7 @@ THE DATA FILES OR SOFTWARE.
COPYRIGHT AND PERMISSION NOTICE
-Copyright © 1991-2018 Unicode, Inc. All rights reserved.
+Copyright © 1991-2019 Unicode, Inc. All rights reserved.
Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
Permission is hereby granted, free of charge, to any person obtaining
- [Emacs-diffs] master updated (b513feb -> ba2a066), Glenn Morris, 2019/01/07
- [Emacs-diffs] master 67b90b5 1/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/01/07
- [Emacs-diffs] master 517b0aa 2/7: Merge from origin/emacs-26,
Glenn Morris <=
- [Emacs-diffs] master 6ab2bf3 3/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/01/07
- [Emacs-diffs] master 2c2bcc4 4/7: Merge from origin/emacs-26, Glenn Morris, 2019/01/07
- [Emacs-diffs] master ff40667 5/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/01/07
- [Emacs-diffs] master ba2a066 7/7: ; Merge from origin/emacs-26, Glenn Morris, 2019/01/07
- [Emacs-diffs] master 1a07b12 6/7: Merge from origin/emacs-26, Glenn Morris, 2019/01/07