changeset 57685:2fdcd73c32aa

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 ........
author Benjamin Peterson <benjamin@python.org>
date Sun, 13 Dec 2009 14:21:46 +0000
parents 46c229742c64
children 548335cb007b
files Doc/license.rst LICENSE
diffstat 2 files changed, 9 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Doc/license.rst	Sun Dec 13 11:42:29 2009 +0000
+++ b/Doc/license.rst	Sun Dec 13 14:21:46 2009 +0000
@@ -98,6 +98,12 @@
 +----------------+--------------+------------+------------+-----------------+
 | 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::
 
--- a/LICENSE	Sun Dec 13 11:42:29 2009 +0000
+++ b/LICENSE	Sun Dec 13 14:21:46 2009 +0000
@@ -59,6 +59,9 @@
     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.1             3.0         2009        PSF         yes
     3.2             3.1         2009        PSF         yes