This is an automated email from the git hooks/post-receive script.
johanvdw-guest pushed a commit to branch ubuntu
in repository rasterio.
commit 7a87f5afb363614b5cfcb1c31452466648fd703c
Merge: 02811cc d6b7b37
Author: Johan Van de Wauw <johan.vandew...@gmail.com>
Date: Tue Dec 23 00:01:55 2014 +0100
Merge branch 'master' into ubuntu
Conflicts:
debian/changelog
.travis.yml | 1 +
AUTHORS.txt | 1 +
CHANGES.txt | 12 ++-
debian/changelog | 6 +-
rasterio/__init__.py | 3 +-
rasterio/_base.pyx | 22 +++--
rasterio/_drivers.pyx | 15 ++++
rasterio/_features.pyx | 10 ++-
rasterio/_io.pyx | 11 +++
rasterio/_warp.pyx | 26 ++++--
rasterio/features.py | 31 ++++---
rasterio/transform.py | 14 ++-
rasterio/warp.py | 140 ++++++++++++++++++++++++-----
setup.py | 5 +-
tests/data/README.rst | 6 ++
tests/test_no_georef.py | 30 +++++++
tests/test_read.py | 26 ++++++
tests/test_warp.py | 235 ++++++++++++++++++++++++++++++++----------------
18 files changed, 440 insertions(+), 154 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
