Merge branch 'branch-6-0' of github.com:mapserver/mapserver into bran…

…ch-6-0
MapServer · Apr 4, 2012 · f2b56e0 · f2b56e0
2 parents 9b1c608 + e0f2384
commit f2b56e0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/HISTORY.TXT b/HISTORY.TXT
@@ -1,4 +1,3 @@
-
 MapServer Revision History
 ==========================
 
@@ -13,7 +12,9 @@ the top of the list.)
 For a complete change history, please see the Subversion log comments.
 
 Current Version (future 6.0.3, SVN branch-6-0):
----------------------------
+-----------------------------------------------
+
+- Added missing DEFRESOLUTION parameter to msCopyMap() function (#4272) 
 
 - Fixed Python MapScript layerObj/classObj Error (#3940)
 

diff --git a/mapcopy.c b/mapcopy.c
@@ -977,6 +977,7 @@ int msCopyMap(mapObj *dst, mapObj *src)
     MS_COPYSTELEM(cellsize);
     MS_COPYSTELEM(units);
     MS_COPYSTELEM(scaledenom);
+    MS_COPYSTELEM(defresolution);
     MS_COPYSTELEM(resolution);
     MS_COPYSTRING(dst->shapepath, src->shapepath); 
     MS_COPYSTRING(dst->mappath, src->mappath);