[Python-modules-commits] [python-qtpy] 02/04: Merge tag 'upstream/1.0.1'

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository python-qtpy.

commit 13b4f8ffab99a27f00dcbd6ee7eb5a91fe6674f0
Merge: d3db6fd b2272b1
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Mon Apr 11 20:28:23 2016 +0100

    Merge tag 'upstream/1.0.1'
    
    Upstream version 1.0.1
    
    # gpg: Signature made Mon 11 Apr 2016 20:28:14 BST using RSA key ID DDEB910A
    # gpg: Good signature from "Ghislain Antony Vaillant <ghisvail at gmail.com>"
    # gpg: WARNING: This key is not certified with a trusted signature!
    # gpg:          There is no indication that the signature belongs to the owner.
    # Primary key fingerprint: 1282 871F 5C7F 0CB6 BBA1  0BD9 A930 D81A 46EC 4F9B
    #      Subkey fingerprint: F3DB 8E75 2506 0E1B DB84  C20D 6A99 0FB3 DDEB 910A

 CHANGELOG.md           | 21 +++++++++++++++++++--
 README.md              |  2 +-
 RELEASE.md             |  4 ++++
 conda.recipe/meta.yaml |  2 +-
 qtpy/QtGui.py          |  5 +++--
 qtpy/QtWidgets.py      |  4 ++--
 qtpy/_version.py       |  2 +-
 setup.py               |  9 ++++-----
 8 files changed, 35 insertions(+), 14 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-qtpy.git