summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-01-04 21:00:47 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-01-04 21:00:47 -0500
commit2a23aca62f9957a9dceb040459b001adfcf99e2f (patch)
tree1d47a26b3c7e4f813da8d4dafca04c34f0698122
parentde1ed61eb47d35ebc68ca4c6e33528ea505423ae (diff)
parent61b2b708a0bab7a6987049c4eee9552408bc8f20 (diff)
downloadpython-setuptools-bitbucket-2a23aca62f9957a9dceb040459b001adfcf99e2f.tar.gz
Merge feature/issue-22919.3b1
-rw-r--r--CHANGES.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index 7ed7434b..339b137d 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,13 @@
CHANGES
=======
+----
+19.3
+----
+
+* Issue #229: Implement new technique for readily incorporating
+ dependencies conditionally from vendored copies or primary
+ locations. Adds a new dependency on six.
----
19.2