Merge branch 'master' into osm

Conflicts: apidoc_config/Menu.txt
2012-01-12 21:27:39 +01:00
parent 3cbd7b4b40 e1ea3471e0
commit 2f700bd894
81 changed files with 562 additions and 225 deletions
@@ -185,6 +185,7 @@
    <li>Protocol/HTTP.html</li>
    <li>Protocol/Script.html</li>
    <li>Protocol/WFS.html</li>
+    <li>Protocol/CSW.html</li>
    <li>Protocol/SOS.html</li>
    <li>Renderer.html</li>
    <li>Renderer/Canvas.html</li>