diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-14 09:02:38 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-06-14 09:02:38 -0400 |
| commit | d32d449a277c7e01d55f186ad2990d2e8dbe5916 (patch) | |
| tree | 93f2dd0ecf3c2581bb256cb79de604fcaf9e0abb | |
| parent | 16666484c9f5f8e3707ccc810ee1504aad47eb7a (diff) | |
| parent | 0aea654b193043aef3f73490ac5ca7a38338e743 (diff) | |
| download | python-setuptools-git-d32d449a277c7e01d55f186ad2990d2e8dbe5916.tar.gz | |
Merge with the rest of 3.7.1
| -rw-r--r-- | .hgtags | 1 | ||||
| -rw-r--r-- | CHANGES.txt | 6 |
2 files changed, 7 insertions, 0 deletions
@@ -138,3 +138,4 @@ e94e768594a1405efde0b79cc60549dd8a4cda9a 3.6 292dfca15d33e72a862d044183a6ad7c06862a19 3.7b1 49bd27eebf212c067392796bb2d0fa6d8e583586 3.7 2fa97c06cc013a9c82f4c1219711e72238d5b6e6 3.8 +9b422fc0b8b97cdb62f02d754283f747adef7f83 3.7.1 diff --git a/CHANGES.txt b/CHANGES.txt index 4d8aba18..b020e533 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -2,6 +2,12 @@ CHANGES ======= +--------------- +3.7.1 and 3.8.1 +--------------- + +* Issue #213: Use legacy StringIO behavior for compatibility under pbr. + --- 3.8 --- |