aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArmin Rigo <arigo@tunes.org>2011-04-12 13:51:03 +0200
committerArmin Rigo <arigo@tunes.org>2011-04-12 13:51:03 +0200
commit8ddaf7054ac593757361941026a20e14306049d3 (patch)
tree4c32fb8187207406ac089cc295131cb87ae70cd6 /LICENSE
parentRemove dead import. (diff)
downloadpypy-8ddaf7054ac593757361941026a20e14306049d3.tar.gz
pypy-8ddaf7054ac593757361941026a20e14306049d3.tar.bz2
pypy-8ddaf7054ac593757361941026a20e14306049d3.zip
Update LICENSE with 2.7 information.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE31
1 files changed, 11 insertions, 20 deletions
diff --git a/LICENSE b/LICENSE
index 85286c6637..27231b56cb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -123,12 +123,12 @@ The PyPy Logo as used by http://speed.pypy.org and others was created
by Samuel Reis and is distributed on terms of Creative Commons Share Alike
License.
-License for 'lib-python/2.5.2' and 'lib-python/2.5.2-modified'
+License for 'lib-python/2.7.0' and 'lib-python/2.7.0-modified'
==============================================================
Except when otherwise stated (look for LICENSE files or
copyright/license information at the beginning of each file) the files
-in the 'lib-python/2.5.2' and 'lib-python/2.5.2-modified' directories
+in the 'lib-python/2.7.0' and 'lib-python/2.7.0-modified' directories
are all copyrighted by the Python Software Foundation and licensed under
the Python Software License of which you can find a copy here:
http://www.python.org/doc/Copyright.html
@@ -161,21 +161,12 @@ License for 'pypy/module/unicodedata/'
======================================
The following files are from the website of The Unicode Consortium
-at http://www.unicode.org/. For the terms of use of these files, see
-http://www.unicode.org/terms_of_use.html
-
- CompositionExclusions-3.2.0.txt
- CompositionExclusions-4.1.0.txt
- CompositionExclusions-5.0.0.txt
- EastAsianWidth-3.2.0.txt
- EastAsianWidth-4.1.0.txt
- EastAsianWidth-5.0.0.txt
- UnicodeData-3.2.0.txt
- UnicodeData-4.1.0.txt
- UnicodeData-5.0.0.txt
-
-The following files are derived from files from the above website. The same
-terms of use apply.
- UnihanNumeric-3.2.0.txt
- UnihanNumeric-4.1.0.txt
- UnihanNumeric-5.0.0.txt
+at http://www.unicode.org/. For the terms of use of these files, see
+http://www.unicode.org/terms_of_use.html . Or they are derived from
+files from the above website, and the same terms of use apply.
+
+ CompositionExclusions-*.txt
+ EastAsianWidth-*.txt
+ LineBreak-*.txt
+ UnicodeData-*.txt
+ UnihanNumeric-*.txt