This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository mapserver.
commit d98c0c4b6928886e0cedc6c3b84df23051e99366 Merge: e26bab3 c062010 Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Tue Jul 7 19:24:30 2015 +0200 Merge tag 'upstream/6.4.2' Upstream version 6.4.2 .gitattributes | 2 - .gitignore | 6 - .travis.yml | 7 +- CMakeLists.txt | 6 +- Vagrantfile | 79 ++++ cgiutil.c | 24 +- cgiutil.h | 1 - cmake/FindAPACHE.cmake | 5 +- cmake/FindOracle.cmake | 4 +- hittest.c | 2 +- mapagg.cpp | 31 +- mapcairo.c | 9 +- mapcontext.c | 3 +- mapcontour.c | 4 + mapcopy.c | 3 - mapdebug.c | 20 +- mapdraw.c | 57 ++- mapfile.c | 213 +++++----- mapgd.c | 10 +- mapgeos.c | 12 +- mapgml.c | 28 +- mapgraticule.c | 35 +- maphash.c | 1 - maphttp.c | 6 + mapimageio.c | 8 +- mapimagemap.c | 124 +++--- mapio.c | 18 + mapio.h | 1 + mapkmlrenderer.cpp | 19 +- maplabel.c | 9 +- maplayer.c | 227 +++++----- maplegend.c | 19 +- maplexer.c | 687 ++++++++++++++++--------------- maplexer.l | 1 + maplibxml2.c | 12 +- maplibxml2.h | 2 +- mapogcfilter.c | 53 +-- mapogcfiltercommon.c | 10 +- mapogcsld.c | 91 ++-- mapogcsld.h | 2 +- mapogcsos.c | 41 +- mapogr.cpp | 7 +- mapogroutput.c | 13 +- mapoutput.c | 63 +-- mapows.c | 97 +++-- mappostgis.c | 110 ++--- mappostgresql.c | 9 +- mapprimitive.c | 14 +- mapproject.c | 2 +- mapquantization.c | 22 +- mapquery.c | 12 +- maprasterquery.c | 2 +- maprendering.c | 19 +- mapresample.c | 6 +- mapscript/csharp/CMakeLists.txt | 4 +- mapscript/java/.gitignore | 1 - mapscript/perl/.gitignore | 5 - mapscript/php/owsrequest.c | 23 ++ mapserv.c | 16 +- mapservutil.c | 151 ++++--- mapshape.c | 196 ++++++--- mapsmoothing.c | 5 +- mapstring.c | 18 +- mapsymbol.c | 4 +- maptemplate.c | 101 +++-- maptile.c | 4 +- maptime.c | 11 +- maptree.c | 1 + maputil.c | 36 +- mapuvraster.c | 17 +- mapwcs.c | 41 +- mapwcs11.c | 49 ++- mapwcs20.c | 46 ++- mapwfs.c | 49 +-- mapwfs11.c | 5 +- mapwfslayer.c | 14 +- mapwms.c | 96 +++-- mapwmslayer.c | 2 +- mapxbase.c | 5 +- renderers/agg/include/agg_conv_clipper.h | 4 + renderers/agg/src/agg_vcgen_dash.cpp | 2 +- scripts/vagrant/mapserver.sh | 33 ++ scripts/vagrant/postgis.sh | 8 + shptreevis.c | 1 + tile4ms.c | 1 + 85 files changed, 1885 insertions(+), 1332 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