aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-01-02 22:32:20 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-01-02 22:32:20 -0500
commit89bbe1de146a90bacb521ffeb6905a5f23498aa8 (patch)
treed4df0e591d76215c1ee7c5cfa39945205b8c6163 /setuptools
parent16ee10c47583a4a2b7480af6fc5a205343acfdfd (diff)
parentb76da40361a632e084ee556910fd392e679e31ef (diff)
downloadexternal_python_setuptools-89bbe1de146a90bacb521ffeb6905a5f23498aa8.tar.gz
external_python_setuptools-89bbe1de146a90bacb521ffeb6905a5f23498aa8.tar.bz2
external_python_setuptools-89bbe1de146a90bacb521ffeb6905a5f23498aa8.zip
Merge with 11.0
--HG-- branch : feature/issue-229
Diffstat (limited to 'setuptools')
-rw-r--r--setuptools/version.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/setuptools/version.py b/setuptools/version.py
index addf63a6..1b1703fd 100644
--- a/setuptools/version.py
+++ b/setuptools/version.py
@@ -1 +1 @@
-__version__ = '10.2.2'
+__version__ = '11.1'