diff flys-artifacts/ChangeLog @ 3122:721298eeb694

Cosmetics. flys-artifacts/trunk@4723 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Felix Wolfsteller <felix.wolfsteller@intevation.de>
date Wed, 20 Jun 2012 12:23:11 +0000
parents 0b86b005bb9a
children edf629d43f05
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog	Wed Jun 20 11:25:21 2012 +0000
+++ b/flys-artifacts/ChangeLog	Wed Jun 20 12:23:11 2012 +0000
@@ -1,3 +1,8 @@
+2012-06-20	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/states/WDifferencesState.java:
+	  Cosmetics, doc.
+
 2012-06-20	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/artifacts/model/fixings/FixCalculation.java:
@@ -85,6 +90,7 @@
 	  src/main/resources/messages_de.properties: Added i18n strings for chart
 	  titles and axes labels.
 
+>>>>>>> .r4722
 2012-06-19	Felix Wolfsteller	<felix.wolfsteller@intevation.de>
 
 	Fix issue681 (wrong vertical lines in duration curve q-mainvalues on

http://dive4elements.wald.intevation.org