summaryrefslogtreecommitdiffstats
path: root/Lib/distutils
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>2011-05-23 19:22:56 (GMT)
committerBarry Warsaw <barry@python.org>2011-05-23 19:22:56 (GMT)
commitcf0d8ab818852503057b8ade6cccc403fbb5d2be (patch)
tree8fcd89ece63691dade1d0c0f5c78f5b70eb84880 /Lib/distutils
parente26bc109ffe4ca1c0cb73270d6f8662e6191cb40 (diff)
downloadcpython-cf0d8ab818852503057b8ade6cccc403fbb5d2be.zip
cpython-cf0d8ab818852503057b8ade6cccc403fbb5d2be.tar.gz
cpython-cf0d8ab818852503057b8ade6cccc403fbb5d2be.tar.bz2
Replay changeset 70238:03e488b5c009 from fubar branch. Original commit
message: Reconcile with the 2.6svn branch. The 2.6.7 release will be made from Subversion, but there were differences, so this brings them in sync. These changes should *not* propagate to any newer versions.
Diffstat (limited to 'Lib/distutils')
-rw-r--r--Lib/distutils/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/distutils/__init__.py b/Lib/distutils/__init__.py
index 90f96fe..6f4c021 100644
--- a/Lib/distutils/__init__.py
+++ b/Lib/distutils/__init__.py
@@ -22,5 +22,5 @@ __revision__ = "$Id$"
#
#--start constants--
-__version__ = "2.6.6"
+__version__ = "2.6.7rc1"
#--end constants--