From: vsr <vsr@opencascade.com>
Date: Fri, 15 Jan 2016 06:21:25 +0000 (+0300)
Subject: Merge branch 'V8_0_BR'
X-Git-Tag: V8_0_0a2^0
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f6e2eed4240c426f1e65b40d1bd7e8d109a4d4b5;p=modules%2Fsmesh.git

Merge branch 'V8_0_BR'
---

f6e2eed4240c426f1e65b40d1bd7e8d109a4d4b5
diff --cc src/Tools/blocFissure/ihm/CMakeLists.txt
index 0ee274979,195dd3418..ebdf0c16e
--- a/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)