Merge branch 'master' into bye-bye-gd

MapServer · Apr 8, 2012 · 1c4e225 · 1c4e225
2 parents 51413e4 + 8c6e47d
commit 1c4e225
Show file tree

Hide file tree

Showing 83 changed files with 101 additions and 70,574 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,4 @@ shptreetst
 shptreevis
 sortshp
 tile4ms
+autom4te.cache
diff --git a/mapcache/INSTALL b/mapcache/INSTALL
diff --git a/mapcache/LICENSE b/mapcache/LICENSE
diff --git a/mapcache/Makefile b/mapcache/Makefile
diff --git a/mapcache/Makefile.inc.in b/mapcache/Makefile.inc.in