diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2014-03-22 18:24:48 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2014-03-22 18:24:48 -0700 |
| commit | ea88fad0f14a5e2652f6e5c8ced4575ed72df584 (patch) | |
| tree | 14be58dc9d3868d3cb234f5a4693b33acd5d9001 | |
| parent | 50598d35a1642346443bf9078cd511ed732dcf41 (diff) | |
| parent | 4d76a909851e2cc55f5bfca74e07af2552f102c1 (diff) | |
| download | paramiko-ea88fad0f14a5e2652f6e5c8ced4575ed72df584.tar.gz | |
Merge branch '1.12' into 1.13
| -rw-r--r-- | setup.cfg | 2 | ||||
| -rw-r--r-- | sites/www/changelog.rst | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/setup.cfg b/setup.cfg deleted file mode 100644 index 5e409001..00000000 --- a/setup.cfg +++ /dev/null @@ -1,2 +0,0 @@ -[wheel] -universal = 1 diff --git a/sites/www/changelog.rst b/sites/www/changelog.rst index ade79cc5..a3558111 100644 --- a/sites/www/changelog.rst +++ b/sites/www/changelog.rst @@ -2,8 +2,6 @@ Changelog ========= -* :support:`290` Add a ``setup.cfg`` marking Paramiko as 'universal' when - generating wheel files. 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 |