Merge branch 'V7_dev'

diff --cc CMakeLists.txt
Simple merge

diff --cc src/SMESHGUI/CMakeLists.txt
Simple merge

diff --cc src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
Simple merge

diff --cc src/SMESHGUI/SMESHGUI_MeshInfo.cxx
Simple merge

diff --cc src/SMESH_I/SMESH_Gen_i.cxx
Simple merge

diff --cc src/StdMeshersGUI/CMakeLists.txt
Simple merge

diff --cc src/Tools/MGCleanerPlug/CMakeLists.txt
Simple merge

diff --cc src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
index 122bb455876949c0c0b73c1075038d4f9d3ed92e,b51f9ebc64394eb74578b7da7c8237590f2b7d83..d96c8b1a48ba96dc5f586d4dc49c740ba7f410d4
--- 1/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
--- 2/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
+++ b/src/Tools/MGCleanerPlug/MGCleanerMonPlugDialog.py
@@@ -22,9 -22,11 +22,10 @@@
  # Modules Eficas
  
  import os, subprocess
+ import tempfile
  from MGCleanerPlugDialog_ui import Ui_MGCleanerPlugDialog
  from MGCleanerMonViewText import MGCleanerMonViewText
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 +from qtsalome import *
  
  
  class MGCleanerMonPlugDialog(Ui_MGCleanerPlugDialog,QWidget):

diff --cc src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
index 81a2c26a825038d139a3e0900b521ebda0d58d52,e4030cc4443127f611517c2ca610582eb373e8f6..a8dafeed46c1e4f8ce3403ba9ccbd6048676bf98
--- 1/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
--- 2/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
+++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
@@@ -19,10 -19,13 +19,11 @@@
  #
  
  # Modules Python
- import string,types,os
+ import string,types,os,sys
+ import tempfile
  import traceback
  
 -from PyQt4 import *
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 +from qtsalome import *
  
  # Import des panels
  

diff --cc src/Tools/MGCleanerPlug/MGCleanerplug_plugin.py
Simple merge

diff --cc src/Tools/MeshCut/CMakeLists.txt
Simple merge

diff --cc src/Tools/MeshCut/meshcut_plugin.py
Simple merge

diff --cc src/Tools/Verima/Gui/CMakeLists.txt
Simple merge

diff --cc src/Tools/YamsPlug/CMakeLists.txt
Simple merge

diff --cc src/Tools/YamsPlug/monViewText.py
index 478e1833d0b0f4d46f3125283b552a6b65d163a2,7d02228e4334a8942ce0421099e2d840105830ef..38aeed49bbd1e1e52d3bce8e27191a3d6b41b402
--- 1/src/Tools/YamsPlug/monViewText.py
--- 2/src/Tools/YamsPlug/monViewText.py
+++ b/src/Tools/YamsPlug/monViewText.py
@@@ -19,10 -19,13 +19,11 @@@
  #
  
  # Modules Python
- import string,types,os
+ import string,types,os, sys
  import traceback
+ import tempfile
  
 -from PyQt4 import *
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 +from qtsalome import *
  
  # Import des panels
  

diff --cc src/Tools/YamsPlug/monYamsPlugDialog.py
index 27953a1b8968fe15e4007df1d617fe3845393d70,37a15f6cc591b6ded93d34d83430cbd8253c8c4c..17f2dd640bdc390aaaea6f8fca2f4deaf71f46dd
--- 1/src/Tools/YamsPlug/monYamsPlugDialog.py
--- 2/src/Tools/YamsPlug/monYamsPlugDialog.py
+++ b/src/Tools/YamsPlug/monYamsPlugDialog.py
@@@ -22,9 -22,12 +22,10 @@@
  # Modules Eficas
  
  import os, subprocess
+ import tempfile
  from YamsPlugDialog_ui import Ui_YamsPlugDialog
  from monViewText import MonViewText
 -from PyQt4.QtGui import *
 -from PyQt4.QtCore import *
 -
 +from qtsalome import *
  
  class MonYamsPlugDialog(Ui_YamsPlugDialog,QWidget):
    """

diff --cc src/Tools/YamsPlug/yamsplug_plugin.py
Simple merge

diff --cc src/Tools/blocFissure/ihm/CMakeLists.txt
Simple merge

diff --cc src/Tools/blocFissure/ihm/fissureCoude_plugin.py
Simple merge

diff --cc src/Tools/padder/spadderpy/gui/CMakeLists.txt
Simple merge

diff --cc src/Tools/padder/spadderpy/gui/inputdialog.py
Simple merge

diff --cc src/Tools/padder/spadderpy/gui/plugindialog.py
Simple merge

diff --cc src/Tools/padder/spadderpy/plugin/spadderPlugin.py
Simple merge