[Greater-commits] r3703 - in branches/3.0.0-all-models/sciparam/SciParam: . UI

[scm-commit@wald.intevation.org]

Author: aheinecke
Date: 2011-07-26 14:55:32 +0200 (Tue, 26 Jul 2011)
New Revision: 3703

Modified:
   branches/3.0.0-all-models/sciparam/SciParam/
   branches/3.0.0-all-models/sciparam/SciParam/UI/test_parameter_list.py
Log:
Merged revisions 3638 via svnmerge from 
svn+ssh://wald.intevation.org/greater/trunk/GREAT-ER/SciParam

........
  r3638 | aheinecke | 2011-07-22 11:38:12 +0200 (Fri, 22 Jul 2011) | 2 lines
  
  Add encoding line
........



Property changes on: branches/3.0.0-all-models/sciparam/SciParam
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/GREAT-ER/SciParam:1-216,340
   + /trunk/GREAT-ER/SciParam:1-216,340,3638

Modified: branches/3.0.0-all-models/sciparam/SciParam/UI/test_parameter_list.py
===================================================================
--- branches/3.0.0-all-models/sciparam/SciParam/UI/test_parameter_list.py	2011-07-26 12:47:05 UTC (rev 3702)
+++ branches/3.0.0-all-models/sciparam/SciParam/UI/test_parameter_list.py	2011-07-26 12:55:32 UTC (rev 3703)
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 # Copyright (C) 2002, 2003, 2005 by Intevation GmbH
 # Authors:
 # Thomas Arendsen Hein <thomas at intevation.de>