aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2011-08-18 18:55:40 -0400
committerJason R. Coombs <jaraco@jaraco.com>2011-08-18 18:55:40 -0400
commitb58cc8e94de52d906f2e04fc910e49fc7fb050c3 (patch)
treecf28760425dd57bfd00104d78cba0aa9a03eea34
parent781b4157b9ea9e95c75187048d5f008432bff16e (diff)
parent827916050d68864c15cb91962908dd01f0fd25ab (diff)
downloadexternal_python_setuptools-b58cc8e94de52d906f2e04fc910e49fc7fb050c3.tar.gz
external_python_setuptools-b58cc8e94de52d906f2e04fc910e49fc7fb050c3.tar.bz2
external_python_setuptools-b58cc8e94de52d906f2e04fc910e49fc7fb050c3.zip
Merge tags for second 0.6.20 release
--HG-- branch : distribute extra : rebase_source : 850c25c0a8981cfd7e8abd153dd857d53dbe3990
-rw-r--r--.hgtags1
-rw-r--r--CHANGES.txt4
2 files changed, 4 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 0cec1be5..9db36cc3 100644
--- a/.hgtags
+++ b/.hgtags
@@ -27,3 +27,4 @@ dae247400d0ca1fdfaf38db275622c9bec550b08 0.6.13
74108d7f07343556a8db94e8122221a43243f586 0.6.18
611910892a0421633d72677979f94a25ef590d54 0.6.19
a7cf5ae137f1646adf86ce5d6b5d8b7bd6eab69f 0.6.20
+c4a375336d552129aef174486018ed09c212d684 0.6.20 \ No newline at end of file
diff --git a/CHANGES.txt b/CHANGES.txt
index aa3eb476..616ba458 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -6,7 +6,9 @@ CHANGES
0.6.20
------
-* ADD STUFF HERE
+* Issue #135: Include url in warning when processing URLs in package_index.
+* Issue #212: Fix issue where easy_instal fails on Python 3 on windows installer.
+* Issue #213: Fix typo in documentation.
------
0.6.19