summaryrefslogtreecommitdiff
path: root/MERGE.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-03 10:42:11 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-03 10:42:11 -0400
commitf86079e4b6629d75a4650be64bdcbe89724138a8 (patch)
tree3214af75c6d2cb04c2550c90accfdfd650ac14e1 /MERGE.txt
parent9eebb2dfe17fa129f2201add401c8fb6eb0ebcc1 (diff)
downloadpython-setuptools-git-f86079e4b6629d75a4650be64bdcbe89724138a8.tar.gz
Backed out improper fix for distribute issue #174
--HG-- branch : Setuptools-Distribute merge extra : source : 28eb706c219004e2dd83dcd1db37d952e8c66908
Diffstat (limited to 'MERGE.txt')
-rw-r--r--MERGE.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/MERGE.txt b/MERGE.txt
index bcff09da..ecb140da 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -28,3 +28,10 @@ Major Changes
<http://bugs.python.org/setuptools/issue33>`_ indicates that the feature
should remain and no substantial justification was given in the `Distribute
report <https://bitbucket.org/tarek/distribute/issue/19/>`_.
+
+Minor Changes
+-------------
+
+* The patch for `#174 <https://bitbucket.org/tarek/distribute/issue/174>`_
+ has been rolled-back, as the comment on the ticket indicates that the patch
+ addressed a symptom and not the fundamental issue.