[mapserver] 03/11: Merge tag 'upstream/7.0.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository mapserver.

commit fc3fc6969c3660ec6b10466bf92961169cda2004
Merge: a010a8b 4661a0d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 25 20:33:49 2016 +0100

    Merge tag 'upstream/7.0.1'
    
    Upstream version 7.0.1

 .gitmodules                            |    0
 .travis.yml                            |   87 -
 CMakeLists.txt                         |  124 +-
 COMMITERS                              |   29 -
 Makefile                               |   15 +-
 astyle.sh                              |   10 -
 genhtml.patch                          |   43 -
 github_issue_no_activity_closer.py     |  123 -
 install-msautotest.sh                  |   14 -
 mapagg.cpp                             |    3 +
 mapaxisorder.csv                       | 1788 -------
 mapaxisorder.h                         | 8206 ++++++++++++++++----------------
 mapaxisorder.sh                        |  110 -
 mapcontour.c                           |  135 +-
 mapdraw.c                              |   91 +-
 mapdrawgdal.c                          |   42 +-
 mapfile.c                              |   33 +-
 mapfile.h                              |    6 +-
 mapgeomtransform.c                     |   39 +-
 mapimageio.c                           |   13 +-
 mapjoin.c                              |    1 +
 maplabel.c                             |   13 +-
 maplayer.c                             |   13 +-
 maplegend.c                            |    4 +-
 maplexer.c                             | 4007 ++++++++--------
 maplexer.l                             |    1 +
 mapogcfilter.c                         |    1 +
 mapogcsld.c                            |  239 +-
 mapogr.cpp                             |   32 +-
 mapogroutput.c                         |   72 +-
 maporaclespatial.c                     |   12 +-
 mappostgis.c                           |    5 +-
 mapprimitive.c                         |    6 +-
 mapproject.c                           |    6 +-
 maprasterquery.c                       |   40 +-
 maprendering.c                         |    1 -
 mapresample.c                          |   95 +-
 mapscript/csharp/examples/drawquery.cs |    2 +-
 mapscript/java/javamodule.i            |    8 +-
 mapscript/mserror.i                    |    2 +-
 mapscript/php/map.c                    |    2 +-
 mapscript/php/nmake.opt                |   35 -
 mapscript/php/php_mapscript.c          |   13 +-
 mapscript/python/setup.py              |   13 +
 mapscript/ruby/rbmodule.i              |   12 +-
 mapserver-config-version.cmake.in      |   11 +
 mapserver-config.cmake.in              |   18 +
 mapshape.c                             |    1 +
 mapstring.c                            |   10 +-
 maptemplate.c                          |    7 +-
 mapthread.c                            |    2 +-
 maptime.c                              |    4 +
 maputil.c                              |   10 +-
 mapuvraster.c                          |   30 +-
 mapv8.cpp                              |    2 +
 mapwcs20.c                             |   30 +-
 mapwfs.c                               |    2 +
 mapwms.c                               |   15 +-
 mapwmslayer.c                          |    2 +-
 nmake.opt                              |  856 ----
 print-test-results.sh                  |   65 -
 release-notes.sh                       |   11 -
 run-test-suite.sh                      |   22 -
 run_code_coverage_upload.sh            |   37 -
 scalebar.c                             |    1 +
 stablemerge.sh                         |   29 -
 xmlmapfile/mapfile.xsd                 |    4 +-
 67 files changed, 6982 insertions(+), 9733 deletions(-)

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