diff options
| author | Georg Brandl <georg@python.org> | 2013-04-06 14:47:34 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2013-04-06 14:47:34 (GMT) |
| commit | 98297f4807eea84f0d671cad6ce5c96bc9f3d9cb (patch) | |
| tree | 608b410fb83662c82cb3d21ffc2e03f7800248e1 /Doc/license.rst | |
| parent | 0aaaa62200d0bae0b79e578234ab74741da4dad3 (diff) | |
| parent | bf561020a7af9a72079be2ab3d848e3ee13e92f1 (diff) | |
| download | cpython-98297f4807eea84f0d671cad6ce5c96bc9f3d9cb.zip cpython-98297f4807eea84f0d671cad6ce5c96bc9f3d9cb.tar.gz cpython-98297f4807eea84f0d671cad6ce5c96bc9f3d9cb.tar.bz2 | |
merge with 3.3
Diffstat (limited to 'Doc/license.rst')
| -rw-r--r-- | Doc/license.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Doc/license.rst b/Doc/license.rst index 3508d54..c3d5d75 100644 --- a/Doc/license.rst +++ b/Doc/license.rst @@ -120,6 +120,8 @@ been GPL-compatible; the table below summarizes 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.4.0 | 3.3.0 | 2014 | PSF | yes | |