Salome HOME
Merge branch 'V8_0_BR' V8_0_0a2 V8_0_0b1
authorvsr <vsr@opencascade.com>
Fri, 15 Jan 2016 06:21:25 +0000 (09:21 +0300)
committervsr <vsr@opencascade.com>
Fri, 15 Jan 2016 06:21:25 +0000 (09:21 +0300)
1  2 
src/SMESHGUI/SMESHGUI_ComputeDlg.cxx
src/StdMeshersGUI/StdMeshersGUI_NbSegmentsCreator.cxx
src/Tools/blocFissure/ihm/CMakeLists.txt

Simple merge
@@@ -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)