[mapserver] 02/07: Merge tag 'upstream/7.0.4'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapserver.

commit 569164a8fdab7a3e0cdf13f450b96b40cf2cf0b8
Merge: cb77fd6 b179a46
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Mon Jan 16 18:52:09 2017 +0100

    Merge tag 'upstream/7.0.4'
    
    Upstream version 7.0.4

 CMakeLists.txt             |   2 +-
 README                     |   2 +-
 README.WIN32               | 127 ++++++++++++++++++++++++++++--------------
 mapcluster.c               |  12 +++-
 mapdrawgdal.c              |  24 +++++++-
 maplegend.c                |  67 ++++++++++++++++++++++-
 mapogcfilter.c             |   4 +-
 mapogcfiltercommon.c       |   2 +
 mapogr.cpp                 | 134 +++++++++++++++++++++++++++++++++++++--------
 mapraster.c                |  58 ++++++++++++++------
 mapresample.c              | 101 ++++++++++++++++++++++++++++++++++
 mapscript/php/README.WIN32 |  96 +++++++++++---------------------
 mapserver.h                |   1 +
 mapstring.c                |   5 +-
 mapwfs.c                   |   2 +-
 mapwfs20.c                 |  43 ++++++++++++---
 16 files changed, 514 insertions(+), 166 deletions(-)

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