[mapserver-commits] [mapserver/mapserver] 1c4e22: Merge branch 'master' into bye-bye-gd

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/mapserver/mapserver
  Commit: 1c4e22502bffcab024c99fff708715808ce14307
      https://github.com/mapserver/mapserver/commit/1c4e22502bffcab024c99fff708715808ce14307
  Author: Thomas Bonfort <thomas.bonfort at gmail.com>
  Date:   2012-04-08 (Sun, 08 Apr 2012)

  Changed paths:
    M .gitignore
  R mapcache/INSTALL
  R mapcache/LICENSE
  R mapcache/Makefile
  R mapcache/Makefile.inc.in
  R mapcache/Makefile.vc
  R mapcache/README
  R mapcache/acinclude.m4
  R mapcache/aclocal.m4
  R mapcache/apache/Makefile.in
  R mapcache/apache/mod_mapcache.c
  R mapcache/benchmark.py
  R mapcache/cgi/Makefile.in
  R mapcache/cgi/mapcache.c
  R mapcache/config.guess
  R mapcache/config.sub
  R mapcache/configure
  R mapcache/configure.in
  R mapcache/include/errors.h
  R mapcache/include/ezxml.h
  R mapcache/include/mapcache.h
  R mapcache/include/util.h
  R mapcache/install-sh
  R mapcache/lib/Makefile.in
  R mapcache/lib/axisorder.c
  R mapcache/lib/buffer.c
  R mapcache/lib/cache_bdb.c
  R mapcache/lib/cache_disk.c
  R mapcache/lib/cache_memcache.c
  R mapcache/lib/cache_sqlite.c
  R mapcache/lib/cache_tiff.c
  R mapcache/lib/configuration.c
  R mapcache/lib/configuration_xml.c
  R mapcache/lib/core.c
  R mapcache/lib/dimension.c
  R mapcache/lib/ezxml.c
  R mapcache/lib/grid.c
  R mapcache/lib/http.c
  R mapcache/lib/image.c
  R mapcache/lib/image_error.c
  R mapcache/lib/imageio.c
  R mapcache/lib/imageio_jpeg.c
  R mapcache/lib/imageio_mixed.c
  R mapcache/lib/imageio_png.c
  R mapcache/lib/lock.c
  R mapcache/lib/service_demo.c
  R mapcache/lib/service_kml.c
  R mapcache/lib/service_tms.c
  R mapcache/lib/service_ve.c
  R mapcache/lib/service_wms.c
  R mapcache/lib/service_wmts.c
  R mapcache/lib/services.c
  R mapcache/lib/source.c
  R mapcache/lib/source_gdal.c
  R mapcache/lib/source_mapserver.c
  R mapcache/lib/source_wms.c
  R mapcache/lib/strptime.c
  R mapcache/lib/tileset.c
  R mapcache/lib/util.c
  R mapcache/ltmain.sh
  R mapcache/mapcache.xml
  R mapcache/mapcache.xml.sample
  R mapcache/mod_geocache.doxyfile
  R mapcache/nginx/README
  R mapcache/nginx/config.in
  R mapcache/nginx/nginx.conf
  R mapcache/nginx/ngx_http_mapcache_module.c
  R mapcache/nmake.opt
  R mapcache/reconfigure.sh
  R mapcache/static/bench_cached.png
  R mapcache/static/bench_merging.png
  R mapcache/static/benchmark.png
  R mapcache/static/geocache.json
  R mapcache/static/geocache.yaml
  R mapcache/util/Makefile.in
  R mapcache/util/mapcache_seed.c
  M mapcairo.c
  M mapdraw.c
  M maperror.c
  M maplabel.c
  M maplegend.c
  M mapscale.c
  M mapsymbol.c

  Log Message:
  -----------
  Merge branch 'master' into bye-bye-gd