Salome HOME
Merge branch 'master' of newgeom:newgeom.git into BR_PORTING_CENTOS_6_3
authorSergey BELASH <belash.sergey@opencascade.com>
Fri, 11 Apr 2014 16:11:45 +0000 (20:11 +0400)
committerSergey BELASH <belash.sergey@opencascade.com>
Fri, 11 Apr 2014 16:11:45 +0000 (20:11 +0400)
commit1b6e67870beeeb667864eaff5b1bb9c1570b7259
treebe389369377f9cef58f216c882257f749e1a2254
parentb948502434f1af72184656e478095dae3fe00f96
parent9cd46e1c0765e466c3b30c2add9f1dd6d9d9bca7
Merge branch 'master' of newgeom:newgeom.git into BR_PORTING_CENTOS_6_3

Conflicts:
CMakeCommon/FindPython.cmake
CMakeCommon/XMLProcessing.cmake
12 files changed:
CMakeCommon/FindPython.cmake
CMakeCommon/XMLProcessing.cmake
linux_env.sh
src/Config/Config_FeatureReader.cpp
src/Config/Config_ModuleReader.cpp
src/Model/Model_Document.cxx
src/ModelAPI/ModelAPI_PluginManager.h
src/XGUI/CMakeLists.txt
src/XGUI/XGUI_PartDataModel.cpp
src/XGUI/XGUI_SelectionMgr.h
src/XGUI/XGUI_Workbench.h
src/XGUI/XGUI_Workshop.cpp