--- a/flys-artifacts/ChangeLog	Tue Oct 16 11:35:36 2012 +0200
+++ b/flys-artifacts/ChangeLog	Tue Oct 16 11:36:21 2012 +0200
@@ -26,6 +26,13 @@
 	  src/main/resources/messages_de_DE.properties:
 	  Fix typo
 
+2012-10-16  Ingo Weinzierl <ingo@intevation.de>
+
+	flys/issue930
+
+	* src/main/java/de/intevation/flys/artifacts/states/HistoricalDischargeComputeState.java:
+	  Add unit [cm] to the facet description if calculation mode is W.
+
 2012-10-15  Ingo Weinzierl <ingo@intevation.de>
 
 	flys/issue904
@@ -12808,7 +12815,6 @@
 	  not. In addition, the scenario parameter used by WSPLGEN is now set
 	  correctly.
 
->>>>>>> .r3356
 2011-12-05	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Allow longitudinal_section.q facets in wdiff states output.