Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0
authorsbh <sergey.belash@opencascade.com>
Thu, 26 Mar 2015 09:55:57 +0000 (12:55 +0300)
committersbh <sergey.belash@opencascade.com>
Thu, 26 Mar 2015 09:55:57 +0000 (12:55 +0300)
commita731f82dccbfdb67cbf8e8d617222a4d3e32018a
tree6fdb344accff6f411c8fccff6a09b083b3d69deb
parenta24b7e6f4d112d5e7889fd76f030298fc428cd01
parente3c21b331e4ec138aec5efcb51e19d6afee46193
Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Plugin.cpp
src/Model/Model_AttributeSelection.cpp
src/SketchPlugin/CMakeLists.txt
src/SketchPlugin/plugin-Sketch.xml