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

2014-01-13 16:07:39 +01:00
parent 8b38639082 2f2b6dd510
commit 610eefb932
9 changed files with 102 additions and 39 deletions
@@ -26,7 +26,7 @@ goog.require('ol.layer.LayerState');
 *            index: number,
 *            layersArray: Array.<ol.layer.Layer>,
 *            layerStates: Object.<number, ol.layer.LayerState>,
- *            logos: Object.<string, boolean>,
+ *            logos: Object.<string, string>,
 *            pixelToCoordinateMatrix: goog.vec.Mat4.Number,
 *            postRenderFunctions: Array.<ol.PostRenderFunction>,
 *            size: ol.Size,