diff options
| author | Georg Brandl <georg@python.org> | 2013-04-06 14:49:23 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-04-06 14:49:23 (GMT) |
| commit | a4f988c2bde9c060b05758ef7c451e34c9b8caab (patch) | |
| tree | 830c489d4b081bab5b506c15593c726ef574c5e9 | |
| parent | 98297f4807eea84f0d671cad6ce5c96bc9f3d9cb (diff) | |
| parent | 03b273f4d19efd594a749402d3175bc65c8a250d (diff) | |
| download | cpython-a4f988c2bde9c060b05758ef7c451e34c9b8caab.zip cpython-a4f988c2bde9c060b05758ef7c451e34c9b8caab.tar.gz cpython-a4f988c2bde9c060b05758ef7c451e34c9b8caab.tar.bz2 | |
merge with 3.3
| -rw-r--r-- | Doc/license.rst | 2 | ||||
| -rw-r--r-- | LICENSE | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index c3d5d75..b09e9a8 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -124,6 +124,8 @@ been GPL-compatible; the table below summarizes the various releases. +----------------+--------------+------------+------------+-----------------+ | 3.3.0 | 3.2 | 2012 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ +| 3.3.1 | 3.3.0 | 2013 | PSF | yes | ++----------------+--------------+------------+------------+-----------------+ | 3.4.0 | 3.3.0 | 2014 | PSF | yes | +----------------+--------------+------------+------------+-----------------+ @@ -76,6 +76,7 @@ the various releases. 3.2.3 3.2.2 2012 PSF yes 3.2.4 3.2.3 2013 PSF yes 3.3.0 3.2 2012 PSF yes + 3.3.1 3.3.0 2013 PSF yes 3.4.0 3.3.0 2014 PSF yes Footnotes: |