# HG changeset patch
# User Bettina Gruenbauer <bettina@intevation.de>
# Date 1363268192 -3600
# Node ID a82b621d87b03c83a84cc3a090a8a4dfdd85ab6e
# Parent  bede568606460ee6c9e2f40d8503453952143390# Parent  eaa63083870544438e3b2783c1f9236d4053d506
merge

diff -r eaa630838705 -r a82b621d87b0 flys-artifacts/doc/conf/rivermap.xml
--- a/flys-artifacts/doc/conf/rivermap.xml	Thu Mar 14 13:39:54 2013 +0100
+++ b/flys-artifacts/doc/conf/rivermap.xml	Thu Mar 14 14:36:32 2013 +0100
@@ -117,4 +117,14 @@
         <river-wms url="http://example.com/cgi-bin/river-wms" layers="Weser"/>
         <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
     </river>
+    <river name="Oder">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Oder"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
+    <river name="Havel">
+        <srid value="31467"/>
+        <river-wms url="http://example.com/cgi-bin/river-wms" layers="Havel"/>
+        <background-wms url="http://osm.intevation.de/mapcache/?" layers="OSM-WMS-Dienst"/>
+    </river>
 </rivermap>