[pypy-commit] pypy py3k: missing license entry lost by merge

plan_rich pypy.commits at gmail.com
Tue Aug 30 04:47:43 EDT 2016


Author: Richard Plangger <planrichi at gmail.com>
Branch: py3k
Changeset: r86726:4ac13ee6aa69
Date: 2016-08-30 10:46 +0200
http://bitbucket.org/pypy/pypy/changeset/4ac13ee6aa69/

Log:	missing license entry lost by merge

diff --git a/LICENSE b/LICENSE
--- a/LICENSE
+++ b/LICENSE
@@ -476,3 +476,15 @@
 
     https://github.com/gperftools/gperftools/blob/master/COPYING
 
+License for 'liblzma and 'lzmaffi'
+----------------------------------
+
+This copy of PyPy may be linked (dynamically or statically) with the
+liblzma library, which was put in the "public domain":
+
+    http://tukaani.org/xz/
+
+The cffi bindings to liblzma (in lib_pypy/_lzma.py) are derived from
+the lzmaffi project which is distributed under a BSD license:
+
+    https://pypi.python.org/pypi/lzmaffi/0.3.0


More information about the pypy-commit mailing list