diff options
| author | Georg Brandl <georg@python.org> | 2013-04-06 16:49:23 +0200 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-04-06 16:49:23 +0200 |
| commit | a636d2a32663d0e78dba8342abcf4c6dcb903bb5 (patch) | |
| tree | 62a6c995b80235a7f20a0260d0e62090771361b7 /Doc/license.rst | |
| parent | ff6eb328c747cacaf3158b6b795f9e1818fb5544 (diff) | |
| parent | 9d81954c0f17905a992e8dc4134b3052467c2afa (diff) | |
| download | cpython-a636d2a32663d0e78dba8342abcf4c6dcb903bb5.tar.gz | |
merge with 3.3
Diffstat (limited to 'Doc/license.rst')
| -rw-r--r-- | Doc/license.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index c3d5d75ef2..b09e9a8176 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -124,6 +124,8 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 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 | +----------------+--------------+------------+------------+-----------------+ |