[gdal-grass] 01/01: Merge branch 'upstream-2.0' into upstream

[Sebastiaan Couwenberg]

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

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

commit 627c44ccea499b63d153b9ecf61728748e72e0e0
Merge: 543f7fc 5515f43
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Mar 1 23:01:45 2016 +0100

    Merge branch 'upstream-2.0' into upstream
    
    Conflicts:
    	VERSION
    	configure.in

 README                 |  8 ++++----
 VERSION                |  2 +-
 configure.in           |  2 +-
 grass57dataset.cpp     | 18 ++++++++++++------
 ogrgrass.h             | 14 +++++++-------
 ogrgrassdatasource.cpp | 10 +++++-----
 ogrgrassdriver.cpp     | 23 +++++++++++++++++++----
 ogrgrasslayer.cpp      | 25 +++++++++++++------------
 8 files changed, 62 insertions(+), 40 deletions(-)

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