aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Friedrich Bolz <cfbolz@gmx.de>2011-04-30 14:26:12 +0200
committerCarl Friedrich Bolz <cfbolz@gmx.de>2011-04-30 14:26:12 +0200
commitb44b192cdc0e20c764f37812600744a81e74a506 (patch)
tree1a89b9b0a211b3d21581c87204c2b6d47f7559b9 /LICENSE
parentupdate contributors (diff)
downloadpypy-b44b192cdc0e20c764f37812600744a81e74a506.tar.gz
pypy-b44b192cdc0e20c764f37812600744a81e74a506.tar.bz2
pypy-b44b192cdc0e20c764f37812600744a81e74a506.zip
update the license too
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE136
1 files changed, 106 insertions, 30 deletions
diff --git a/LICENSE b/LICENSE
index 27231b56cb..9449f0cf85 100644
--- a/LICENSE
+++ b/LICENSE
@@ -37,78 +37,154 @@ copyrighted by one or more of the following people and organizations:
Armin Rigo
Maciej Fijalkowski
Carl Friedrich Bolz
- Samuele Pedroni
+ Amaury Forgeot d'Arc
Antonio Cuni
+ Samuele Pedroni
Michael Hudson
- Christian Tismer
Holger Krekel
+ Christian Tismer
+ Benjamin Peterson
Eric van Riet Paap
+ Anders Chrigström
+ Håkan Ardö
Richard Emslie
- Anders Chrigstrom
- Amaury Forgeot d Arc
- Aurelien Campeas
+ Dan Villiom Podlaski Christiansen
+ Alexander Schremmer
+ Alex Gaynor
+ David Schneider
+ Aurelién Campeas
Anders Lehmann
+ Camillo Bruni
Niklaus Haldimann
- Seo Sanghyeon
Leonardo Santagada
+ Toon Verwaest
+ Seo Sanghyeon
Lawrence Oluyede
+ Bartosz Skowron
Jakub Gustak
Guido Wesdorp
- Benjamin Peterson
- Alexander Schremmer
- Niko Matsakis
+ Adrien Di Mascio
+ Laura Creighton
Ludovic Aubry
+ Niko Matsakis
+ Daniel Roberts
+ Jason Creighton
+ Jacob Hallén
Alex Martelli
- Toon Verwaest
+ Anders Hammarquist
+ Jan de Mooij
Stephan Diehl
- Adrien Di Mascio
+ Michael Foord
Stefan Schwarzer
Tomek Meka
Patrick Maupin
- Jacob Hallen
- Laura Creighton
Bob Ippolito
- Camillo Bruni
- Simon Burton
Bruno Gola
Alexandre Fayolle
Marius Gedminas
+ Simon Burton
+ Jean-Paul Calderone
+ John Witulski
+ Wim Lavrijsen
+ Andreas Stührk
+ Jean-Philippe St. Pierre
Guido van Rossum
+ Pavel Vinogradov
Valentino Volonghi
- Adrian Kuhn
Paul deGrandis
+ Adrian Kuhn
+ tav
+ Georg Brandl
Gerald Klix
Wanja Saatkamp
- Anders Hammarquist
+ Boris Feigin
Oscar Nierstrasz
+ Dario Bertini
+ David Malcolm
Eugene Oden
+ Henry Mason
Lukas Renggli
Guenter Jantzen
- Dinu Gherman
- Bartosz Skowron
- Georg Brandl
+ Ronny Pfannschmidt
+ Bert Freudenberg
+ Amit Regmi
Ben Young
- Jean-Paul Calderone
Nicolas Chauvat
+ Andrew Durdin
+ Michael Schneider
+ Nicholas Riley
Rocco Moretti
+ Gintautas Miliauskas
Michael Twomey
- boria
- Jared Grubb
+ Igor Trindade Oliveira
+ Lucian Branescu Mihaila
Olivier Dormond
+ Jared Grubb
+ Karl Bartel
+ Gabriel Lavoie
+ Brian Dorsey
+ Victor Stinner
Stuart Williams
- Jens-Uwe Mager
+ Toby Watson
+ Antoine Pitrou
Justas Sadzevicius
+ Neil Shepperd
Mikael Schönenberg
- Brian Dorsey
+ Gasper Zejn
Jonathan David Riehl
- Beatrice During
Elmo Mäntynen
- Andreas Friedge
- Alex Gaynor
Anders Qvist
+ Beatrice Düring
+ Alexander Sedov
+ Vincent Legoll
Alan McIntyre
- Bert Freudenberg
- Tav
+ Romain Guillebert
+ Alex Perry
+ Jens-Uwe Mager
+ Dan Stromberg
+ Lukas Diekmann
+ Carl Meyer
+ Pieter Zieschang
+ Alejandro J. Cura
+ Sylvain Thenault
+ Travis Francis Athougies
+ Henrik Vendelbo
+ Lutz Paelike
+ Jacob Oscarson
+ Martin Blais
+ Lucio Torre
+ Lene Wagner
+ Miguel de Val Borro
+ Ignas Mikalajunas
+ Artur Lisiecki
+ Joshua Gilbert
+ Godefroid Chappelle
+ Yusei Tahara
+ Christopher Armstrong
+ Stephan Busemann
+ Gustavo Niemeyer
+ William Leslie
+ Akira Li
+ Kristján Valur Jonsson
+ Bobby Impollonia
+ Andrew Thompson
+ Anders Sigfridsson
+ Jacek Generowicz
+ Dan Colish
+ Sven Hager
+ Zooko Wilcox-O Hearn
+ Anders Hammarquist
+ Dinu Gherman
+ Dan Colish
+ Daniel Neuhäuser
+ Michael Chermside
+ Konrad Delong
+ Anna Ravencroft
+ Greg Price
+ Armin Ronacher
+ Jim Baker
+ Philip Jenvey
+ Rodrigo Araújo
Heinrich-Heine University, Germany
Open End AB (formerly AB Strakt), Sweden