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
@@ -198,6 +198,8 @@ ol.renderer.webgl.ImageLayer.prototype.renderFrame =

    this.image_ = image;
    this.texture_ = texture;
+
+    this.updateAttributions(frameState.attributions, image.getAttributions());
  }
 };