Merge branch 'V8_0_BR'

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

diff --cc src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
Simple merge

diff --cc src/Tools/blocFissure/ihm/CMakeLists.txt
index 0ee274979cd9e1086ec6ed67b59919d54eebf68a,195dd34181e271f8e9e8b61f6756daca2895a5fb..ebdf0c16e9f98e179e22aa18680340f98c1b76ef
--- 1/src/Tools/blocFissure/ihm/CMakeLists.txt
--- 2/src/Tools/blocFissure/ihm/CMakeLists.txt
+++ b/src/Tools/blocFissure/ihm/CMakeLists.txt
@@@ -42,6 -41,6 +42,6 @@@ PYQT_WRAP_UIC(_pyuic_SCRIPTS ${_pyuic_f
  
  # --- rules ---
  
 -SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}/blocFissure/ihm)
 +SALOME_INSTALL_SCRIPTS("${plugin_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/blocFissure/ihm)
  
- SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/blocFissure/ihm)
 -SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_SMESH_INSTALL_PLUGINS}/blocFissure/ihm)
++SALOME_INSTALL_SCRIPTS("${_pyuic_SCRIPTS}" ${SALOME_INSTALL_PYTHON}/blocFissure/ihm)