]> SALOME platform Git repositories - modules/geom.git/commitdiff
Salome HOME
Merge V9_dev branch into master
authorrnv <rnv@opencascade.com>
Wed, 6 Jun 2018 11:48:41 +0000 (14:48 +0300)
committerrnv <rnv@opencascade.com>
Thu, 14 Jun 2018 11:40:29 +0000 (14:40 +0300)
12 files changed:
1  2 
idl/GEOM_Gen.idl
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
src/EntityGUI/EntityGUI_PolylineDlg.cxx
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GeometryGUI.cxx
src/GEOMImpl/GEOMImpl_IShapesOperations.cxx
src/GEOMImpl/GEOMImpl_IShapesOperations.hxx
src/GEOM_SWIG/GEOM_Nut.py
src/GEOM_SWIG/geomBuilder.py
src/GEOM_SWIG_WITHIHM/CMakeLists.txt
src/MeasureGUI/MeasureGUI_FastCheckIntersectionsDlg.cxx
src/XAO_Swig/CMakeLists.txt

Simple merge
Simple merge
Simple merge
index e3560e179310e5c7ae9a17d18ad277019f74efa3,ef9530012f1aec0761eb4e79b0f5ece840278ac0..290b212daf4e1b158a938e4b933bce451757b657
mode 100644,100755..100644
Simple merge
Simple merge
Simple merge