summaryrefslogtreecommitdiffstats
path: root/Doc
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2009-12-13 14:21:46 (GMT)
committerBenjamin Peterson <benjamin@python.org>2009-12-13 14:21:46 (GMT)
commitd94dfe84f8d3c9b3c49e6ab00af662af829c168b (patch)
treea4a5ba74fefd6a38ac71d60cec70a2769f5ce1b6 /Doc
parent365aff3a9c3e421097782e5220790ee9ef849f2c (diff)
downloadcpython-d94dfe84f8d3c9b3c49e6ab00af662af829c168b.zip
cpython-d94dfe84f8d3c9b3c49e6ab00af662af829c168b.tar.gz
cpython-d94dfe84f8d3c9b3c49e6ab00af662af829c168b.tar.bz2
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 ........
Diffstat (limited to 'Doc')
-rw-r--r--Doc/license.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst
index 7b77b60..9451be0 100644
--- a/Doc/license.rst
+++ b/Doc/license.rst
@@ -98,6 +98,12 @@ been GPL-compatible; the table below summarizes the various releases.
+----------------+--------------+------------+------------+-----------------+
| 3.2 | 3.1 | 2009 | 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::