This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch experimental in repository mapserver.
commit ea504bc3bbc279e1f404a841846fedd4a3d1b9a8 Merge: bb7c2c4 2644109 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Fri Jul 24 11:25:42 2015 +0200 Merge tag 'upstream/7.0.0' into experimental Upstream version 7.0.0 .gitmodules | 3 - .travis.yml | 2 +- CMakeLists.txt | 8 +- HISTORY.TXT | 12 +- Makefile | 4 +- fontcache.c | 4 +- install-msautotest.sh | 14 + mapcairo.c | 3 +- mapcluster.c | 2 +- mapcontext.c | 7 +- mapdebug.c | 4 +- mapdraw.c | 1 + maperror.c | 16 +- maperror.h | 4 +- mapfile.c | 17 +- mapgdal.c | 2 +- mapgeos.c | 4 +- mapgml.c | 1 + mapio.c | 10 +- mapkmlrenderer.cpp | 4 +- maplexer.c | 782 ++++++++++++++++---------------- maplexer.l | 2 + mapmssql2008.c | 45 +- mapobject.c | 1 + mapogcfilter.c | 3 +- mapogcfiltercommon.c | 1 + mapogcsld.c | 5 +- mapogcsos.c | 1 + mapogr.cpp | 1 + mapogroutput.c | 5 + maporaclespatial.c | 10 +- mapoutput.c | 1 + mapows.c | 1 + mapows.h | 13 +- mapparser.c | 192 ++++---- mapparser.h | 4 +- mappool.c | 2 +- mappostgis.c | 4 +- mapquery.c | 6 +- maprendering.c | 3 +- mapscript/php/color.c | 98 +++- mapscript/php/image.c | 15 +- mapscript/php/label.c | 2 - mapscript/php/line.c | 4 - mapscript/php/mapscript_i.c | 22 +- mapscript/php/owsrequest.c | 7 +- mapscript/php/php_mapscript.c | 4 +- mapscript/php/php_mapscript.h | 1 + mapscript/php/php_mapscript_util.c | 4 + mapscript/php/result.c | 4 - mapscript/php/shapefile.c | 4 - mapscript/swiginc/color.i | 38 +- mapscript/swiginc/layer.i | 5 + mapscript/swiginc/mapzoom.i | 3 - mapscript/swiginc/rect.i | 5 +- mapscript/swiginc/symbol.i | 18 +- mapserv.c | 6 +- mapserver.h | 10 +- mapservutil.c | 1 + mapshape.c | 1 + mapsymbol.c | 1 + maptemplate.c | 21 +- mapthread.c | 8 +- mapthread.h | 2 +- maputil.c | 6 +- mapwcs.c | 1 + mapwcs11.c | 1 + mapwcs20.c | 1 + mapwfs.c | 41 +- mapwms.c | 11 +- mapwmslayer.c | 1 + renderers/agg/src/agg_font_freetype.cpp | 6 +- scripts/vagrant/mapserver.sh | 2 +- shp2img.c | 14 +- 74 files changed, 884 insertions(+), 688 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapserver.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel