Merge branch 'master' into 3526

Conflicts: lib/OpenLayers/Tile.js
2011-09-29 17:51:35 -06:00
parent 085c1156c2 cca0bf5e38
commit db4cbac247
1 changed files with 0 additions and 2 deletions
--- a/tests/manual/dateline-sketch.html
+++ b/tests/manual/dateline-sketch.html
@@ -13,8 +13,6 @@
        }
    </style>

-    <script src="http://maps.google.com/maps/api/js?v=3.5&amp;sensor=false"></script>
-
    <script src="../../lib/OpenLayers.js"></script>
    <script type="text/javascript">