Merge branch 'branch-5-4' into branch-5-6

MapServer · Apr 4, 2012 · 8b8e4dc · 8b8e4dc
2 parents 31697f5 + ab1ee9e
commit 8b8e4dc
Showing 1 changed file with 18 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,21 @@
 config.log
 config.status
 *.dll
-
+*.swp
+Makefile
+legend
+libmapserver.a
+mapscript/csharp/Makefile
+mapscript/java/Makefile
+mapscriptvars
+mapserv
+mapserver-config
+msencrypt
+nbproject
+scalebar
+shp2img
+shptree
+shptreetst
+shptreevis
+sortshp
+tile4ms