Merge remote-tracking branch 'openlayers/master' into vector-api

2014-01-09 15:33:58 +01:00
parent 9961e489cb bed7084200
commit 3b3b5013ad
9 changed files with 32 additions and 16 deletions
--- a/src/ol/source/stamensource.js
+++ b/src/ol/source/stamensource.js
@@ -113,7 +113,8 @@ goog.inherits(ol.source.Stamen, ol.source.XYZ);


 /**
- * @const {Array.<ol.Attribution>}
+ * @const
+ * @type {Array.<ol.Attribution>}
 */
 ol.source.Stamen.ATTRIBUTIONS = [
  new ol.Attribution({