debug bloc fissure after merge master

diff --git a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py
index d6144f20a8a1929dacbb2f5aeb01571c2a857dbf..d8884190069f47ec713697d42a15b49c3799c6be 100644 (file)
--- a/src/Tools/blocFissure/ihm/fissureCoude_plugin.py
+++ b/src/Tools/blocFissure/ihm/fissureCoude_plugin.py
@@ -30,7 +30,7 @@ from blocFissure.gmu import initLog
 initLog.setVerbose()
 
 from blocFissure.gmu import geomsmesh
-from blocFissure.casStandard import casStandard
+from blocFissure.gmu.casStandard import casStandard
 
 from blocFissure.ihm.fissureCoude_ihm import fissureCoude_ihm
 

diff --git a/src/Tools/smesh_plugins.py b/src/Tools/smesh_plugins.py
index e8798921d31b735624022f8f90952cd638dbde1a..3fedbd2815f6c8d20ec6c651c02c171dcbc7decc 100644 (file)
--- a/src/Tools/smesh_plugins.py
+++ b/src/Tools/smesh_plugins.py
@@ -1,4 +1,4 @@
-# -*- coding: iso-8859-1 -*-
+# -*- coding: utf-8 -*-
 # Copyright (C) 2011-2015  EDF R&D
 #
 # This library is free software; you can redistribute it and/or