[gdal-grass] 03/04: Merge tag 'upstream/2.1.0_beta1' into experimental-2.1

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch experimental-2.1
in repository gdal-grass.

commit 33cfc6611db597db4f1843b01fd2ea63e536dec7
Merge: 2531c63 60a8a97
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 2 18:26:17 2016 +0200

    Merge tag 'upstream/2.1.0_beta1' into experimental-2.1
    
    Upstream version 2.1.0~beta1
    
    Conflicts:
    	VERSION
    	configure.in

 Makefile.in            |  10 +-
 VERSION                |   2 +-
 configure.in           |   8 +-
 grass57dataset.cpp     | 254 +++++++++++++++++++--------------------
 ogrgrass.h             |  28 +++--
 ogrgrassdatasource.cpp |  57 +++++----
 ogrgrassdriver.cpp     |  38 +++---
 ogrgrasslayer.cpp      | 313 ++++++++++++++++++++++++-------------------------
 8 files changed, 350 insertions(+), 360 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gdal-grass.git