From: vsr <vsr@opencascade.com>
Date: Thu, 3 Apr 2014 11:25:50 +0000 (+0400)
Subject: Merge branch V7_3_1_BR
X-Git-Tag: V7_4_0a1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5d68554076bbca0e1e95fb0db215a6c2b84b6c54;p=modules%2Fsmesh.git

Merge branch V7_3_1_BR
---

5d68554076bbca0e1e95fb0db215a6c2b84b6c54
diff --cc CMakeLists.txt
index 441f79c0a,97b780d46..4dd5f2eb1
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -29,10 -29,10 +29,10 @@@ STRING(TOUPPER ${PROJECT_NAME} PROJECT_
  
  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 0)
 +SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
  
  # Find KERNEL
  # ===========
diff --cc src/SMESHGUI/SMESHGUI.cxx
index c90cb0fa9,6fb58cea1..336363ecb
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@@ -182,23 -181,7 +182,8 @@@
  // of auto-color picking up
  #define SIMPLE_AUTOCOLOR
  
- // REMOVE the code about MPLMathText_Disabler if it does not complite at porting to ParaView-4.1
- #include <vtkMatplotlibMathTextUtilities.h>
- namespace
- {
-   // Creation of this class disables vtkMatplotlibMathTextUtilities
-   struct MPLMathText_Disabler : protected vtkMatplotlibMathTextUtilities
-   {
-     MPLMathText_Disabler()
-     {
-       vtkMatplotlibMathTextUtilities::MPLMathTextAvailable =
-         vtkMatplotlibMathTextUtilities::UNAVAILABLE;
-     }
-   };
- } 
- 
 -//namespace{
 +namespace
 +{
    // Declarations
    //=============================================================
    void ImportMeshesFromFile(SMESH::SMESH_Gen_ptr theComponentMesh,