Merged 3.4 into default

2b4ec1ce · Donald Stufft · c114e7db · d9fe22ce · 2b4ec1ce · 2b4ec1ce
Kaydet (Commit) 2b4ec1ce authored Ock 11, 2015 tarafından Donald Stufft
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

__init__.py Lib/ensurepip/__init__.py +1 -1

setuptools-11.3.1-py2.py3-none-any.whl ...ensurepip/_bundled/setuptools-11.3.1-py2.py3-none-any.whl +0 -0

No files found.
--- a/Lib/ensurepip/__init__.py
+++ b/Lib/ensurepip/__init__.py
@@ -8,7 +8,7 @@ import tempfile
 __all__ = ["version", "bootstrap"]


-_SETUPTOOLS_VERSION = "11.0"
+_SETUPTOOLS_VERSION = "11.3.1"

 _PIP_VERSION = "6.0.6"


--- a/Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl
+++ b/Lib/ensurepip/_bundled/setuptools-11.0-py2.py3-none-any.whl