diff options
| author | Georg Brandl <georg@python.org> | 2013-09-22 09:46:51 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-09-22 09:46:51 (GMT) |
| commit | a2838878faa5d661914d48350cb3a6a02d925465 (patch) | |
| tree | 133020af26d57891036a984d666ce36a29742ab8 /Doc/license.rst | |
| parent | df4cb129e4a449ca0b6556dcc9437a35bef5723d (diff) | |
| parent | 587b30571d8dff63f602ac303659988d7c2ddea3 (diff) | |
| download | cpython-a2838878faa5d661914d48350cb3a6a02d925465.zip cpython-a2838878faa5d661914d48350cb3a6a02d925465.tar.gz cpython-a2838878faa5d661914d48350cb3a6a02d925465.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc/license.rst')
| -rw-r--r-- | Doc/license.rst | 74 |
1 files changed, 1 insertions, 73 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index b09e9a8..598ba86 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -50,83 +50,11 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 2.1.1 | 2.1+2.0.1 | 2001 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ -| 2.2 | 2.1.1 | 2001 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ | 2.1.2 | 2.1.1 | 2002 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ | 2.1.3 | 2.1.2 | 2002 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ -| 2.2.1 | 2.2 | 2002 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.2.2 | 2.2.1 | 2002 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.2.3 | 2.2.2 | 2002-2003 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.3 | 2.2.2 | 2002-2003 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.3.1 | 2.3 | 2002-2003 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.3.2 | 2.3.1 | 2003 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.3.3 | 2.3.2 | 2003 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.3.4 | 2.3.3 | 2004 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.3.5 | 2.3.4 | 2005 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.4 | 2.3 | 2004 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.4.1 | 2.4 | 2005 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.4.2 | 2.4.1 | 2005 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.4.3 | 2.4.2 | 2006 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.4.4 | 2.4.3 | 2006 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.5 | 2.4 | 2006 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.5.1 | 2.5 | 2007 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.6 | 2.5 | 2008 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.6.1 | 2.6 | 2008 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.6.2 | 2.6.1 | 2009 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.6.3 | 2.6.2 | 2009 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 2.6.4 | 2.6.3 | 2009 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.0 | 2.6 | 2008 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.0.1 | 3.0 | 2009 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.1 | 3.0.1 | 2009 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.1.1 | 3.1 | 2009 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.1.2 | 3.1.1 | 2010 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.1.3 | 3.1.2 | 2010 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.1.4 | 3.1.3 | 2011 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.2 | 3.1 | 2011 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.2.1 | 3.2 | 2011 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.2.2 | 3.2.1 | 2011 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.2.3 | 3.2.2 | 2012 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.2.4 | 3.2.3 | 2013 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.3.0 | 3.2 | 2012 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.3.1 | 3.3.0 | 2013 | PSF | yes | -+----------------+--------------+------------+------------+-----------------+ -| 3.4.0 | 3.3.0 | 2014 | PSF | yes | +| 2.2 and above | 2.1.1 | 2001-now | PSF | yes | +----------------+--------------+------------+------------+-----------------+ .. note:: |