aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2022-01-22 20:26:28 +0200
committerMatti Picus <matti.picus@gmail.com>2022-01-22 20:26:28 +0200
commit8683e7f4e09ae46881accd8d8c2cd2332781270f (patch)
treecc9eb9be9eb6062851d2b93dc76eda7b07391071 /LICENSE
parentmake test skip more cleanly (diff)
parentmerge py2.7-openssl3 which provides OpenSSL3 (diff)
downloadpypy-8683e7f4e09ae46881accd8d8c2cd2332781270f.tar.gz
pypy-8683e7f4e09ae46881accd8d8c2cd2332781270f.tar.bz2
pypy-8683e7f4e09ae46881accd8d8c2cd2332781270f.zip
merge default
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE8
1 files changed, 7 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index 3d9452f2c8..bdc91a4153 100644
--- a/LICENSE
+++ b/LICENSE
@@ -100,6 +100,7 @@ copyrighted by one or more of the following people and organizations:
Alex Martelli
Ondrej Baranovič
Spenser Bauman
+ Yusuke Izawa
Michal Bendowski
Jan de Mooij
Stefan Beyer
@@ -141,7 +142,6 @@ copyrighted by one or more of the following people and organizations:
Andreas Stührk
Jean-Philippe St. Pierre
Stian Andreassen
- Yusuke Izawa
Guido van Rossum
Pavel Vinogradov
William Leslie
@@ -178,6 +178,7 @@ copyrighted by one or more of the following people and organizations:
Lukas Renggli
Dusty Phillips
Guenter Jantzen
+ Bert Freudenberg
Amit Regmi
Ned Batchelder
Jasper Schulz
@@ -269,6 +270,7 @@ copyrighted by one or more of the following people and organizations:
Jacek Generowicz
Sylvain Thenault
Alejandro J. Cura
+ Roberto De Ioris
Andrew Dalke
Gabriel
Nathan Taylor
@@ -372,6 +374,7 @@ copyrighted by one or more of the following people and organizations:
alexprengere
Dennis Sweeney
Kevin Lee
+ h-vertini
Anna Ravencroft
Dinu Gherman
Michael Chermside
@@ -476,6 +479,9 @@ copyrighted by one or more of the following people and organizations:
Christoph Reiter
Chris Burr
Brad Kish
+ David Hewitt
+ Michael Cho
+ Isuru Fernando
Heinrich-Heine University, Germany
Open End AB (formerly AB Strakt), Sweden