LICENSE - Issue 1678243002: Update LICENSE file and README.chromium

Unified Diff: LICENSE

Issue 1678243002: Update LICENSE file and README.chromium (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/icu.git@master

Patch Set: update README.chromium Created 4 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: LICENSE

diff --git a/LICENSE b/LICENSE

index cb47c2ced9716851974479087a20414e30779a09..da119bcce0a6898c05834e5c6f742d35358b7460 100644

--- a/LICENSE

+++ b/LICENSE

@@ -2,7 +2,7 @@ ICU License - ICU 1.8.1 and later

others

@@ -47,7 +47,7 @@ Third-Party Software Licenses

Distributed under the Terms of Use in

http://www.unicode.org/copyright.html.

@@ -85,9 +85,9 @@ written authorization of the copyright holder.

2. Chinese/Japanese Word Break Dictionary Data (cjdict.txt)

- # The Google Chrome software developed by Google is licensed under the BSD li

-cense. Other software included in this distribution is provided under other licen

-ses, as set forth below.

+ # The Google Chrome software developed by Google is licensed under

+ # the BSD license. Other software included in this distribution is

+ # provided under other licenses, as set forth below.

# The BSD License

# http://opensource.org/licenses/bsd-license.php

@@ -95,36 +95,41 @@ ses, as set forth below.

- # Redistribution and use in source and binary forms, with or without modifi

-cation, are permitted provided that the following conditions are met:

- #

- # Redistributions of source code must retain the above copyright notice, th

-is list of conditions and the following disclaimer.

- # Redistributions in binary form must reproduce the above copyright notice,

- this list of conditions and the following disclaimer in the documentation and/or

- other materials provided with the distribution.

- # Neither the name of Google Inc. nor the names of its contributors may be

- used to endorse or promote products derived from this software without specific

-prior written permission.

- #

- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS I

-S" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPL

-IED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLA

-IMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIR

-ECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDIN

-G, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF L

-IABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

- OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED O

-F THE POSSIBILITY OF SUCH DAMAGE.

- #

- # The word list in cjdict.txt are generated by combining three word lists l

-isted

- # below with further processing for compound word breaking. The frequency i

-s generated

- # with an iterative training against Google web corpora.

+ # Redistribution and use in source and binary forms, with or

+ # without modification, are permitted provided that the

+ # following conditions are met:

+ #

+ # Redistributions of source code must retain the above copyright

+ # notice, this list of conditions and the following disclaimer.

+ # Redistributions in binary form must reproduce the above

+ # copyright notice, this list of conditions and the following

+ # disclaimer in the documentation and/or other materials

+ # provided with the distribution.

+ # Neither the name of Google Inc. nor the names of its

+ # contributors may be used to endorse or promote products

+ # derived from this software without specific prior written

+ # permission.

+ #

+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND

+ # CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,

+ # INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF

+ # MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR

+ # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

+ # SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

+ # NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

+ # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN

+ # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR

+ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,

+ # EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

+ #

+ # The word list in cjdict.txt are generated by combining three

+ # word lists listed below with further processing for compound

+ # word breaking. The frequency is generated with an iterative

+ # training against Google web corpora.

# * Libtabe (Chinese)

# - https://sourceforge.net/project/?group_id=1519

@@ -206,12 +211,10 @@ s generated

# c-tsai4@uiuc.edu http://casper.beckman.uiuc.edu/~c-tsai4

- # ---------------COPYING.libtabe-----END-----------------------------------

+ # ---------------COPYING.libtabe-----END------------------------------------

- # ---------------COPYING.ipadic-----BEGIN----------------------------------

---

+ # ---------------COPYING.ipadic-----BEGIN------------------------------------

@@ -293,50 +296,34 @@ s generated

# Project: http://code.google.com/p/lao-dictionary/

# Dictionary: http://lao-dictionary.googlecode.com/git/Lao-Dictionary.txt

- # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICEN

-SE.txt

+ # License: http://lao-dictionary.googlecode.com/git/Lao-Dictionary-LICENSE.txt

# (copied below)

- # This file is derived from the above dictionary, with slight modifications

- # -------------------------------------------------------------------------

--------

+ # This file is derived from the above dictionary, with slight modifications.

+ # --------------------------------------------------------------------------------

- # Redistribution and use in source and binary forms, with or without modifi

-cation,

+ # Redistribution and use in source and binary forms, with or without modification,

# are permitted provided that the following conditions are met:

- # Redistributions of source code must retain the above copyright no

-tice, this

- # list of conditions and the following disclaimer. Redistributions

-in binary

- # form must reproduce the above copyright notice, this list of cond

-itions and

- # the following disclaimer in the documentation and/or other materi

-als

+ # Redistributions of source code must retain the above copyright notice, this

+ # list of conditions and the following disclaimer. Redistributions in binary

+ # form must reproduce the above copyright notice, this list of conditions and

+ # the following disclaimer in the documentation and/or other materials

# provided with the distribution.

- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS I

-S" AND

- # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMP

-LIED

+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

+ # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIA

-BLE FOR

- # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DA

-MAGES

- # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVIC

-ES;

- # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED A

-ND ON

+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR

+ # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

-THIS

+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- # -------------------------------------------------------------------------

--------

+ # --------------------------------------------------------------------------------

4. Burmese Word Break Dictionary Data (burmesedict.txt)

@@ -346,48 +333,35 @@ THIS

# This list is part of a project hosted at:

# github.com/kanyawtech/myanmar-karen-word-lists

- # -------------------------------------------------------------------------

--------

+ # --------------------------------------------------------------------------------

- # Redistribution and use in source and binary forms, with or without modifi

-cation,

+ # Redistribution and use in source and binary forms, with or without modification,

# are permitted provided that the following conditions are met:

- # Redistributions of source code must retain the above copyright notice,

-this

+ # Redistributions of source code must retain the above copyright notice, this

# list of conditions and the following disclaimer.

- # Redistributions in binary form must reproduce the above copyright notic

-e, this

- # list of conditions and the following disclaimer in the documentation an

-d/or

+ # Redistributions in binary form must reproduce the above copyright notice, this

+ # list of conditions and the following disclaimer in the documentation an d/or

# other materials provided with the distribution.

# Neither the name Myanmar Karen Word Lists, nor the names of its

# contributors may be used to endorse or promote products derived from

# this software without specific prior written permission.

- # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS I

-S" AND

- # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMP

-LIED

+ # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND

+ # ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED

# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE

- # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIA

-BLE FOR

- # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DA

-MAGES

- # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVIC

-ES;

- # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED A

-ND ON

+ # DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR

+ # ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES

+ # (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

+ # LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON

# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

- # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF

-THIS

+ # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS

# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

- # -------------------------------------------------------------------------

--------

+ # --------------------------------------------------------------------------------

5. Time Zone Database

« no previous file with comments | « no previous file | README.chromium » ('j') | no next file with comments »