diff flys-artifacts/ChangeLog @ 4139:947d79b9c675

Merged heads.
author Ingo Weinzierl <ingo.weinzierl@intevation.de>
date Mon, 15 Oct 2012 16:09:12 +0200
parents 1d9c9a3493ea
children 0ac1158605bd d7db9baa4e62
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Mon Oct 15 15:23:13 2012 +0200
+++ b/flys-artifacts/ChangeLog	Mon Oct 15 16:09:12 2012 +0200
@@ -1,3 +1,14 @@
+2012-10-15  Ingo Weinzierl <ingo@intevation.de>
+
+	flys/issue904
+
+	* src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java:
+	  Defined two constants for converting discharge table values into [cm].
+
+	* src/main/java/de/intevation/flys/artifacts/model/Calculation6.java:
+	  Use the new constants for value conversion for master discharge table
+	  and historical discharge tables.
+
 2012-10-15  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue548

http://dive4elements.wald.intevation.org