summaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2011-09-04 06:42:26 (GMT)
committerGeorg Brandl <georg@python.org>2011-09-04 06:42:26 (GMT)
commitfbd1e041af2057065339bc643a00a55682427aa7 (patch)
tree04ed21f68370a28c0608c2a0925ac18feaa28971 /LICENSE
parentfd164c207f188e952125a0ce21a1fdec2b78170d (diff)
parent06ee0209614ea0d1a0801b673f1c5ee83b9ded5a (diff)
downloadcpython-fbd1e041af2057065339bc643a00a55682427aa7.zip
cpython-fbd1e041af2057065339bc643a00a55682427aa7.tar.gz
cpython-fbd1e041af2057065339bc643a00a55682427aa7.tar.bz2
Merge with 3.2.
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE6
1 files changed, 5 insertions, 1 deletions
diff --git a/LICENSE b/LICENSE
index d3cde01..3a37dd6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -67,8 +67,12 @@ the various releases.
3.0.1 3.0 2009 PSF yes
3.1 3.0.1 2009 PSF yes
3.1.1 3.1 2009 PSF yes
- 3.1.2 3.1 2010 PSF yes
+ 3.1.2 3.1.1 2010 PSF yes
+ 3.1.3 3.1.2 2010 PSF yes
+ 3.1.4 3.1.3 2011 PSF yes
3.2 3.1 2011 PSF yes
+ 3.2.1 3.2 2011 PSF yes
+ 3.2.2 3.2.1 2011 PSF yes
3.3 3.2 2012 PSF yes
Footnotes: