Merge branch V7_3_1_BR

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09b16c8671d1e31a0865806ffb6512f4231c2919..373adc5f8b884cdc641e835607ba2b1b989e8741 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
 SET(${PROJECT_NAME_UC}_MAJOR_VERSION 7)
 SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
-SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
+SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
 SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
@@ -99,7 +99,7 @@ ENDIF(SALOME_BUILD_GUI)
 # OCCT
 FIND_PACKAGE(SalomeCAS REQUIRED)
 #VTK
-FIND_PACKAGE(SalomeVTK 6.0 REQUIRED)
+FIND_PACKAGE(SalomeVTK 6.1 REQUIRED)
 
 # Find GEOM
 # ===========

diff --git a/env_HEXABLOCKPLUGIN_src.sh b/env_HEXABLOCKPLUGIN_src.sh
deleted file mode 100644 (file)
index 4578c00..0000000
--- a/env_HEXABLOCKPLUGIN_src.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#------ HEXABLOCKPLUGIN_src ------
-export HEXABLOCKPLUGIN_SRC_DIR=${INST_ROOT}/HEXABLOCKPLUGIN_SRC_6.2.0
-##