diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-04 22:37:14 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2013-05-04 22:37:14 -0400 |
| commit | 476342be985a7478e13618b578d111f7781b108b (patch) | |
| tree | cff6c12e81abca9242ec5877c15fdc33696609a9 | |
| parent | 2ef81e9e51106d228200737348d6646fe94ab435 (diff) | |
| download | external_python_setuptools-476342be985a7478e13618b578d111f7781b108b.tar.gz external_python_setuptools-476342be985a7478e13618b578d111f7781b108b.tar.bz2 external_python_setuptools-476342be985a7478e13618b578d111f7781b108b.zip | |
Updated merge notes to reflect less invasive change (and regression). Thanks PJE for pointing out the flaw in my reasoning.
--HG--
branch : Setuptools-Distribute merge
extra : source : 07d5668a8c0c09caf690c8f4f449eb46b4e45ab3
| -rw-r--r-- | MERGE.txt | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -76,9 +76,7 @@ Minor Changes * Wording of some output has changed to replace contractions with their canonical form (i.e. prefer "could not" to "couldn't"). -* Manifest files are no longer written for .exe launchers. The - Distribute-based script launchers are used and they launch Python as a - subprocess, rather than loading the Python DLL in-process. +* Manifest files are only written for 32-bit .exe launchers. Differences from Distribute 0.6.36: |