summaryrefslogtreecommitdiff
path: root/MERGE.txt
Commit message (Collapse)AuthorAgeFilesLines
* Moved MERGE.txt into the setuptools documentation.Jason R. Coombs2013-06-091-111/+0
| | | | | --HG-- rename : MERGE.txt => docs/merge.txt
* Add note about dropped support for Python 2.3Jason R. Coombs2013-05-281-0/+1
|
* Updated merge notes again to reference relevant changesets and final processJason R. Coombs2013-05-121-3/+4
| | | | | --HG-- branch : Setuptools-Distribute merge
* Update merge notes again to reflect revised techniqueJason R. Coombs2013-05-121-14/+21
| | | | | --HG-- branch : Setuptools-Distribute merge
* Updated merge notes to reflect less invasive change (and regression). Thanks ↵Jason R. Coombs2013-05-041-3/+1
| | | | | | | | PJE for pointing out the flaw in my reasoning. --HG-- branch : Setuptools-Distribute merge extra : source : 07d5668a8c0c09caf690c8f4f449eb46b4e45ab3
* Updated merge notesJason R. Coombs2013-05-041-1/+59
| | | | | | --HG-- branch : Setuptools-Distribute merge extra : source : 9d926f62c15cff2f25a9c8b8e9a2984246a5ba5c
* Merge setuptools.command.easy_installJason R. Coombs2013-05-031-0/+5
| | | | | --HG-- branch : Setuptools-Distribute merge
* easy_install once again honors setup.cfg if found in the current directoryJason R. Coombs2013-05-031-0/+4
| | | | | | --HG-- branch : Setuptools-Distribute merge extra : source : 422fc7e84eb2a22aa13df44dea6f138d7c840e83
* Backed out improper fix for distribute issue #174Jason R. Coombs2013-05-031-0/+7
| | | | | | --HG-- branch : Setuptools-Distribute merge extra : source : 28eb706c219004e2dd83dcd1db37d952e8c66908
* Distributions are once again installed as zipped eggs by default.Jason R. Coombs2013-05-031-0/+5
| | | | | | --HG-- branch : Setuptools-Distribute merge extra : source : f3b1c801d877734669007ad4f5d8cee091a6c767
* Adding MERGE notesJason R. Coombs2013-03-301-0/+25
--HG-- branch : Setuptools-Distribute merge extra : source : c404c8580bd1450d84cc4f0f32245ebd1130bcfc