summaryrefslogtreecommitdiffhomepage
path: root/sites/www
diff options
context:
space:
mode:
authorJeff Forcier <jeff@bitprophet.org>2014-03-22 18:26:18 -0700
committerJeff Forcier <jeff@bitprophet.org>2014-03-22 18:26:18 -0700
commita495da760fcd43369c62a586e4e751a1635c213d (patch)
tree474102b58fc0f12575a2026a31aebe42118e12b6 /sites/www
parent1fa5f8239d102cb06364bacb87985b97b4944cbb (diff)
parent87b57dc0cd2d8cb1b6eb605f8b885fac2937c3c6 (diff)
Merge branch '1.13'
Diffstat (limited to 'sites/www')
-rw-r--r--sites/www/changelog.rst5
1 files changed, 3 insertions, 2 deletions
diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst
index ade79cc5..02fee80b 100644
--- a/sites/www/changelog.rst
+++ b/sites/www/changelog.rst
@@ -2,8 +2,9 @@
Changelog
=========
-* :support:`290` Add a ``setup.cfg`` marking Paramiko as 'universal' when
- generating wheel files. Courtesy of Alex Gaynor.
+* :support:`290` (also :issue:`292`) Add support for building universal
+ (Python 2+3 compatible) wheel files during the release process. Courtesy of
+ Alex Gaynor.
* :support:`284` Add Python language trove identifiers to ``setup.py``. Thanks
to Alex Gaynor for catch & patch.
* :bug:`235` Improve string type testing in a handful of spots (e.g. ``s/if