diff options
| author | Georg Brandl <georg@python.org> | 2011-09-04 06:42:26 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2011-09-04 06:42:26 (GMT) |
| commit | fbd1e041af2057065339bc643a00a55682427aa7 (patch) | |
| tree | 04ed21f68370a28c0608c2a0925ac18feaa28971 /Doc/license.rst | |
| parent | fd164c207f188e952125a0ce21a1fdec2b78170d (diff) | |
| parent | 06ee0209614ea0d1a0801b673f1c5ee83b9ded5a (diff) | |
| download | cpython-fbd1e041af2057065339bc643a00a55682427aa7.zip cpython-fbd1e041af2057065339bc643a00a55682427aa7.tar.gz cpython-fbd1e041af2057065339bc643a00a55682427aa7.tar.bz2 | |
Merge with 3.2.
Diffstat (limited to 'Doc/license.rst')
| -rw-r--r-- | Doc/license.rst | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 9119f18..5050ff0 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -106,10 +106,18 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.1.1 | 3.1 | 2009 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ -| 3.1.2 | 3.1 | 2010 | 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.3 | 3.2 | 2012 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ |