[OpenLayers-Commits] r11788 - in sandbox/cmoullet/openlayers: . lib/OpenLayers/Format lib/OpenLayers/Format/XLS

[commits-20090109 at openlayers.org]

Author: cmoullet
Date: 2011-03-30 07:06:08 -0700 (Wed, 30 Mar 2011)
New Revision: 11788

Modified:
   sandbox/cmoullet/openlayers/
   sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS.js
   sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1.js
   sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js
Log:
Merge with trunk



Property changes on: sandbox/cmoullet/openlayers
___________________________________________________________________
Modified: svn:mergeinfo
   - /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11775,11777-11784
   + /sandbox/roberthl/openlayers:9745-9748
/trunk/openlayers:11161-11775,11777-11787

Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1.js	2011-03-30 14:05:13 UTC (rev 11787)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1.js	2011-03-30 14:06:08 UTC (rev 11788)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2010 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for 
  * full list of contributors). Published under the Clear BSD license.  
  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
  * full text of the license. */

Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js	2011-03-30 14:05:13 UTC (rev 11787)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS/v1_1_0.js	2011-03-30 14:06:08 UTC (rev 11788)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2010 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for 
  * full list of contributors). Published under the Clear BSD license.  
  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
  * full text of the license. */

Modified: sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS.js
===================================================================
--- sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS.js	2011-03-30 14:05:13 UTC (rev 11787)
+++ sandbox/cmoullet/openlayers/lib/OpenLayers/Format/XLS.js	2011-03-30 14:06:08 UTC (rev 11788)
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006-2010 by OpenLayers Contributors (see authors.txt for 
+/* Copyright (c) 2006-2011 by OpenLayers Contributors (see authors.txt for 
  * full list of contributors). Published under the Clear BSD license.  
  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the
  * full text of the license. */