[Mpuls-commits] r4540 - wasko/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2011-02-01 09:54:50 +0100 (Tue, 01 Feb 2011)
New Revision: 4540

Modified:
   wasko/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: wasko/trunk/ChangeLog
===================================================================
--- wasko/trunk/ChangeLog	2011-02-01 08:53:32 UTC (rev 4539)
+++ wasko/trunk/ChangeLog	2011-02-01 08:54:50 UTC (rev 4540)
@@ -1,3 +1,8 @@
+<<<<<<< .mine
+2011-02-01  Torsten Irlaender <torsten at intevation.de>
+
+	* wasko.json: Issue1744: Adapted dates to a new evaluation period
+
 2011-01-31  Roland Geider <roland.geider at intevation.de>
 
 	* waskoweb/public/formed/formedtree.xml: issue1755: the case nr. field is