Merge branch 'master' into osm

Conflicts:
	apidoc_config/Menu.txt
This commit is contained in:
Éric Lemoine
2012-01-12 21:27:39 +01:00
81 changed files with 562 additions and 225 deletions
+2
View File
@@ -242,6 +242,8 @@
"OpenLayers/Protocol/WFS/v1.js",
"OpenLayers/Protocol/WFS/v1_0_0.js",
"OpenLayers/Protocol/WFS/v1_1_0.js",
"OpenLayers/Protocol/CSW.js",
"OpenLayers/Protocol/CSW/v2_0_2.js",
"OpenLayers/Protocol/Script.js",
"OpenLayers/Protocol/SOS.js",
"OpenLayers/Protocol/SOS/v1_0_0.js",