[Python-modules-commits] [python-pkgconfig] 03/05: Merge branch 'upstream'

[Josué Ortega]

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

josue pushed a commit to branch master
in repository python-pkgconfig.

commit 3831ff8c2a0cbf14d51ac061facdfe14bbc3982a
Merge: 7e40bd3 11ddd67
Author: Josue Ortega <josue at debian.org>
Date:   Sun Dec 11 13:23:22 2016 -0600

    Merge branch 'upstream'

 .gitignore             |  1 +
 .travis.yml            |  3 ++-
 MANIFEST.in            |  2 ++
 README.rst             | 48 ++++++++++++++++++++++++++++++++++++++++++++-
 data/fake-gtk+-3.0.pc  |  2 +-
 data/fake-python.pc    |  2 +-
 pkgconfig/pkgconfig.py | 53 ++++++++++++++++++++++++++++++++++++--------------
 setup.py               |  2 +-
 test.py                | 11 +++++++++--
 tox.ini                |  2 +-
 10 files changed, 103 insertions(+), 23 deletions(-)

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