diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-12-13 14:20:15 +0000 |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-12-13 14:20:15 +0000 |
| commit | 6e363a5f716174194c615024e0865adcc83a63ae (patch) | |
| tree | 0085ff9e620fecf763c5185c684096d8ea9139db | |
| parent | ac4f942837531cd9afa19ca707450ba91cd499fb (diff) | |
| download | cpython-git-6e363a5f716174194c615024e0865adcc83a63ae.tar.gz | |
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
........
| -rw-r--r-- | Doc/license.rst | 6 | ||||
| -rw-r--r-- | LICENSE | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 278bb2d843..e7d3db5103 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -96,6 +96,12 @@ 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 | ++----------------+--------------+-----------+------------+-----------------+ .. note:: @@ -59,6 +59,9 @@ the various releases. 2.5.3 2.5.2 2008 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 Footnotes: |