Merge branch 'master' of github.com:openlayers/ol3 into interim-tiles

2013-02-19 08:59:23 -07:00
parent e8c50c7290 a04774cd96
commit b061e23606
31 changed files with 1682 additions and 172 deletions
@@ -84,7 +84,8 @@ ol.source.ImageSource.prototype.createImage =
  var imageUrl = this.imageUrlFunction(extent, size);
  if (goog.isDef(imageUrl)) {
    image = new ol.Image(
-        extent, resolution, imageUrl, this.crossOrigin_);
+        extent, resolution, imageUrl, this.crossOrigin_,
+        this.getAttributions());
  }
  return image;
 };