summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGeorg Brandl <georg@python.org>2012-09-09 09:19:17 (GMT)
committerGeorg Brandl <georg@python.org>2012-09-09 09:19:17 (GMT)
commit5497295917ec9ea054eb3e6daf0c06060901cc7e (patch)
tree0f1d77f8fa3bac2eb0c258b416751cf42a112d46 /Lib
parent4725b13ab335ff320eef8dc115941b8d34026023 (diff)
parent05823f7d6783440920b11024bfc76f15e86093af (diff)
downloadcpython-5497295917ec9ea054eb3e6daf0c06060901cc7e.zip
cpython-5497295917ec9ea054eb3e6daf0c06060901cc7e.tar.gz
cpython-5497295917ec9ea054eb3e6daf0c06060901cc7e.tar.bz2
Merge in changes from 3.3.0rc2 release clone.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/__init__.py2
-rw-r--r--Lib/idlelib/idlever.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 8d73b51..f23d886 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -13,5 +13,5 @@ used from a setup script as
# Updated automatically by the Python release process.
#
#--start constants--
-__version__ = "3.3.0rc1"
+__version__ = "3.3.0rc2"
#--end constants--
diff --git a/Lib/idlelib/idlever.py b/Lib/idlelib/idlever.py
index 4a65a88..b73ce75 100644
--- a/Lib/idlelib/idlever.py
+++ b/Lib/idlelib/idlever.py
@@ -1 +1 @@
-IDLE_VERSION = "3.3.0rc1"
+IDLE_VERSION = "3.3.0rc2"