Merge branch 'master' into tile-fade-in

Conflicts: tests/Tile/Image.html
2012-01-17 09:27:55 +01:00
parent d3db3011a3 0aaa5265b4
commit 99ca32540d
95 changed files with 818 additions and 246 deletions
--- a/lib/OpenLayers/Layer/Grid.js
+++ b/lib/OpenLayers/Layer/Grid.js
@@ -835,7 +835,7 @@ OpenLayers.Layer.Grid = OpenLayers.Class(OpenLayers.Layer.HTTPRequest, {
     *     potential specific implementations in sub-classes.)
     *
     * Returns:
-     * {OpenLayers.Bounds}
+     * {<OpenLayers.Bounds>}
     */
    getMaxExtent: function() {
        return this.maxExtent;