Merge branch 'upstream-master' into gears

2011-11-21 18:54:48 +01:00
parent 735f49cca0 2f802750a3
commit 8360ddefe3
10 changed files with 592 additions and 809 deletions
@@ -128,7 +128,6 @@
                "OpenLayers/Layer/FixedZoomLevels.js",
                "OpenLayers/Layer/Google.js",
                "OpenLayers/Layer/Google/v3.js",
-                "OpenLayers/Layer/Yahoo.js",
                "OpenLayers/Layer/HTTPRequest.js",
                "OpenLayers/Layer/Grid.js",
                "OpenLayers/Layer/MapGuide.js",
@@ -249,7 +248,6 @@
                "OpenLayers/Protocol/SOS.js",
                "OpenLayers/Protocol/SOS/v1_0_0.js",
                "OpenLayers/Layer/PointTrack.js",
-                "OpenLayers/Layer/GML.js",
                "OpenLayers/Style.js",
                "OpenLayers/Style2.js",
                "OpenLayers/StyleMap.js",