This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch master
in repository rasterio.
commit bf8ffbfc461c072e1a9c1573c06e0b1f9b4fd650
Merge: 970dfa0 6bf9f19
Author: Johan Van de Wauw <jo...@vandewauw.be>
Date: Mon Oct 26 11:03:52 2015 +0100
Merge tag 'upstream/0.29.0'
Upstream version 0.29.0
.travis.yml | 13 +++++-
CHANGES.txt | 9 ++++
CODE_OF_CONDUCT.md | 22 ++++++++++
rasterio/__init__.py | 2 +-
rasterio/_base.pyx | 15 +++++--
rasterio/rio/calc.py | 5 ++-
rasterio/rio/merge.py | 1 +
rasterio/rio/options.py | 2 +
requirements-dev.txt | 2 +-
requirements.txt | 2 +-
scripts/travis_gdal_install.sh | 91 +++++++++++++++++++++++++++++++++++++++++
setup.py | 7 +---
tests/data/shade.tif | Bin 1050093 -> 1050234 bytes
tests/test_options.py | 2 +-
tests/test_profile.py | 21 ++++++++--
15 files changed, 174 insertions(+), 20 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/rasterio.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
