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 ................

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 ................
aeb48d48 · Benjamin Peterson · b50488c9 · aeb48d48 · aeb48d48
Commit aeb48d48 authored Dec 13, 2009 by Benjamin Peterson
Hide whitespace changes
Inline Side-by-side

Showing with 18 additions and 0 deletions

Doc/license.rst Doc/license.rst +12 -0

LICENSE LICENSE +6 -0

No files found.
--- 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::

--- a/LICENSE
+++ b/LICENSE
@@ -59,7 +59,13 @@ 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
    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

 Footnotes: