diff flys-artifacts/ChangeLog @ 4146:5589b1fd459d

Merged.
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Tue, 16 Oct 2012 11:28:33 +0200
parents d39f229ea990 58864f4f6e3b
children 0f60efc39953
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Tue Oct 16 11:27:27 2012 +0200
+++ b/flys-artifacts/ChangeLog	Tue Oct 16 11:28:33 2012 +0200
@@ -1,3 +1,24 @@
+2012-10-16	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	Fix issue946.
+
+	* flys-artifacts/doc/conf/meta-data.xml: Load wkms with different
+	  parameter for fix wq curves.
+
+	* flys-artifacts/doc/conf/artifacts/fixanalysis.xml:
+	  Add new facet to compat list.
+
+	* flys-artifacts/doc/conf/default-themes.xml,
+	  flys-artifacts/doc/conf/second-themes.xml,
+	  flys-artifacts/doc/conf/themes.xml:
+	  Added new theme/mapping.
+
+	* flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/FacetTypes.java:
+	  Register new facet type.
+
+	* flys-artifacts/src/main/java/de/intevation/flys/exports/fixings/FixWQCurveGenerator.java:
+	  Handle "new" Facet.
+
 2012-10-16	Christian Lins	<christian.lins@intevation.de>
 
 	* src/main/java/de/intevation/flys/exports/MiddleBedHeightGenerator.java,

http://dive4elements.wald.intevation.org