[Mpuls-commits] r3047 - base/trunk

[scm-commit@wald.intevation.org]

Author: torsten
Date: 2010-06-21 11:47:45 +0200 (Mon, 21 Jun 2010)
New Revision: 3047

Modified:
   base/trunk/ChangeLog
Log:
Updated ChangeLog


Modified: base/trunk/ChangeLog
===================================================================
--- base/trunk/ChangeLog	2010-06-21 09:46:17 UTC (rev 3046)
+++ base/trunk/ChangeLog	2010-06-21 09:47:45 UTC (rev 3047)
@@ -1,3 +1,8 @@
+2010-06-21  Torsten Irländer <torsten.irlaender at intevation.de>
+
+	* mpulsweb/model/case.py (MpulsCaseFactory._initNewCase): Added pass
+	statement
+
 2010-06-18  Bernhard Herzog  <bh at intevation.de>
 
 	* mpulsweb/templates/appointments/show_body.mako,
@@ -117,6 +122,7 @@
 	informative debug logs
 	(MpulsCase.__getattr__): Improve debug log contents.
 
+>>>>>>> .r3045
 2010-06-11  Torsten Irländer <torsten.irlaender at intevation.de>
 	
 	Changed validity icons. Ported from 1.7.1 branch of waska