[Greater-commits] r3647 - in branches/3.0.0-all-models/GREAT-ER: . Greater/Dialogs

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-25 15:22:40 +0200 (Mon, 25 Jul 2011)
New Revision: 3647

Modified:
   branches/3.0.0-all-models/GREAT-ER/
   branches/3.0.0-all-models/GREAT-ER/ChangeLog
   branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editdischargedata.py
   branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editenvironment.py
   branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editsubstance.py
   branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/openparablock.py
Log:
Merged revisions 231 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER

........
  r231 | aheinecke | 2011-06-22 10:01:43 +0200 (Wed, 22 Jun 2011) | 2 lines
  
  Add magic encoding line where necessary
........



Property changes on: branches/3.0.0-all-models/GREAT-ER
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER:1-230
   + /trunk/GREAT-ER:1-231

Modified: branches/3.0.0-all-models/GREAT-ER/ChangeLog
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:13:21 UTC (rev 3646)
+++ branches/3.0.0-all-models/GREAT-ER/ChangeLog	2011-07-25 13:22:40 UTC (rev 3647)
@@ -4,6 +4,11 @@
 	* Greater/Modules/analysis.py: Change classnames to Thuban 1.2 names
 	* Greater/Dialogs/opensession.py: Add encoding line
 	* Greater/UI/session.py: Change classgen classnames to Thuban 1.2
+	* Greater/Modules/catchment.py: Change classgen classnames to Thuban 1.2
+	* Greater/Dialogs/editdischargedata.py: Add encoding line
+	* Greater/Dialogs/editsubstance.py: Add encoding line
+	* Greater/Dialogs/editenvironment.py: Add encoding line
+	* Greater/Dialogs/openparablock.py: Add encoding line
 
 2006-05-10  Frank Koormann   <frank at intevation.de>
 

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editdischargedata.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editdischargedata.py	2011-07-25 13:13:21 UTC (rev 3646)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editdischargedata.py	2011-07-25 13:22:40 UTC (rev 3647)
@@ -1,4 +1,6 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 #
 # Copyright (C) 2002 by Intevation GmbH
 # Authors:

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editenvironment.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editenvironment.py	2011-07-25 13:13:21 UTC (rev 3646)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editenvironment.py	2011-07-25 13:22:40 UTC (rev 3647)
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2002 by Intevation GmbH
 # Authors:

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editsubstance.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editsubstance.py	2011-07-25 13:13:21 UTC (rev 3646)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/editsubstance.py	2011-07-25 13:22:40 UTC (rev 3647)
@@ -1,4 +1,5 @@
 #!/usr/bin/env python
+# -*- coding: utf-8 -*-
 #
 # Copyright (C) 2002 by Intevation GmbH
 # Authors:

Modified: branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/openparablock.py
===================================================================
--- branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/openparablock.py	2011-07-25 13:13:21 UTC (rev 3646)
+++ branches/3.0.0-all-models/GREAT-ER/Greater/Dialogs/openparablock.py	2011-07-25 13:22:40 UTC (rev 3647)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (c) 2002, 2003 by Intevation GmbH
 # Authors:
 # Jan-Oliver Wagner <jan at intevation.de>