diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-12-13 14:29:42 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-12-13 14:29:42 (GMT) |
| commit | 3d9ff88c7603bb405e556b174f4e90229703ed86 (patch) | |
| tree | 7d11b38dbc35ba27b8568d71ba6e5d8ea3c48d55 /Doc/license.rst | |
| parent | b7a24f91d509ab93d130f64f582c831e998bd8e1 (diff) | |
| download | cpython-3d9ff88c7603bb405e556b174f4e90229703ed86.zip cpython-3d9ff88c7603bb405e556b174f4e90229703ed86.tar.gz cpython-3d9ff88c7603bb405e556b174f4e90229703ed86.tar.bz2 | |
Merged revisions 76787-76789 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r76787 | benjamin.peterson | 2009-12-13 08:21:46 -0600 (Sun, 13 Dec 2009) | 9 lines
Merged revisions 76785 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r76785 | benjamin.peterson | 2009-12-13 08:18:08 -0600 (Sun, 13 Dec 2009) | 1 line
add 2.6.x point releases
........
................
r76788 | benjamin.peterson | 2009-12-13 08:23:30 -0600 (Sun, 13 Dec 2009) | 1 line
fix markup
................
r76789 | benjamin.peterson | 2009-12-13 08:26:42 -0600 (Sun, 13 Dec 2009) | 1 line
update 3.x versions
................
Diffstat (limited to 'Doc/license.rst')
| -rw-r--r-- | Doc/license.rst | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index eb266a7..b402c50 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -92,8 +92,20 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 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 | ++----------------+--------------+------------+------------+-----------------+ .. note:: |