Merge branch 'master' into bug-4329-pixmap-loading

MapServer · May 29, 2012 · 4494445 · 4494445
2 parents 33a02b6 + fd7af49
commit 4494445
Show file tree

Hide file tree

Showing 9 changed files with 8,183 additions and 3,506 deletions.
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -14,6 +14,14 @@ For a complete change history, please see the Git log comments.
 Current Version (git master, 6.1-dev, future 6.2): 
 -------------------------------------------------
 
+- Added INSPIRE ExtendedCapabilities and DOCTYPE definition to WMS 1.1.1 (#3608)
+
+- Fix wms_enable_request-related errors are not properly tagged (#4187)
+
+- Fixed locations of supported and native formats in Capabilities and CoverageDescriptions for WCS 2.0 (#4003)
+
+- Made format parameter for WCS 2.0 GetCoverage requests optional (#4003)
+
 - Swig mapscript for multi-label support (#4310)
 
 - Fix creation of a vector symbolObj in mapscript (#4318)