[mapserver] 02/06: Merge tag 'upstream/7.0.2'

[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 3033d6f9426c92d68f90122d307a3930dbfb74d2
Merge: c8c22a2 6ff28f0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Wed Sep 21 20:56:44 2016 +0200

    Merge tag 'upstream/7.0.2'
    
    Upstream version 7.0.2

 CMakeLists.txt                              |    2 +-
 HISTORY.TXT                                 |    4 +-
 hittest.c                                   |   11 +
 kerneldensity.c                             |    1 +
 mapcairo.c                                  |    5 +-
 mapchart.c                                  |    7 +-
 mapcluster.c                                |   57 +-
 mapcopy.c                                   |   15 +-
 mapdraw.c                                   |   60 +-
 mapdrawgdal.c                               |    9 +
 mapfile.c                                   |  164 +++-
 mapgraticule.c                              |   23 +-
 maplabel.c                                  |    9 +-
 maplegend.c                                 |   12 +-
 maplibxml2.c                                |    7 +-
 mapmssql2008.c                              |  111 ++-
 mapogcfilter.c                              |  103 ++-
 mapogcfilter.h                              |    1 +
 mapogcfiltercommon.c                        |   29 +-
 mapogcsld.c                                 |    1 +
 mapogcsos.c                                 |    2 +-
 mapogr.cpp                                  | 1303 +++++++++++++++++++++------
 mapogroutput.c                              |   35 +-
 mapowscommon.c                              |   56 +-
 mappostgis.c                                |   76 +-
 mapprimitive.c                              |   12 +-
 mapquery.c                                  |   53 +-
 mapraster.c                                 |   36 +-
 maprasterquery.c                            |   10 +-
 mapscript/csharp/CMakeLists.txt             |    8 +-
 mapscript/csharp/Makefile.vc                |    3 +-
 mapscript/csharp/csmodule.i                 |   26 +-
 mapscript/csharp/examples/drawmapGDIPlus.cs |   97 ++
 mapscript/csharp/examples/drawmapWPF.cs     |  109 +++
 mapscript/csharp/swig_csharp_extensions.i   |   50 +
 mapscript/php/layer.c                       |  100 +-
 mapscript/swiginc/class.i                   |    9 +-
 mapscript/swiginc/color.i                   |    2 +-
 mapserver.h                                 |    2 +-
 mapsymbol.c                                 |    6 +
 maputfgrid.cpp                              |   58 +-
 mapwcs20.c                                  |   21 +-
 mapwfs.c                                    |    7 +-
 mapwfs11.c                                  |   20 +-
 mapwfs20.c                                  |    6 +-
 45 files changed, 2097 insertions(+), 641 deletions(-)

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