Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authornds <natalia.donis@opencascade.com>
Fri, 27 Mar 2015 07:38:37 +0000 (10:38 +0300)
committernds <natalia.donis@opencascade.com>
Fri, 27 Mar 2015 07:38:37 +0000 (10:38 +0300)
commit3e3d76500389cb3a5a6eeb09f229cd3c83730dac
tree38bd664a8e4bad5b7787e23268ee4d1566629a94
parent7a9d129fbffa9ad35c2c25eaace17459b829015b
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Validators.cpp
src/Config/Config_Common.cpp
src/Config/Config_Common.h
src/Config/Config_Keywords.h
src/Config/Config_ValidatorReader.cpp
src/Config/Config_ValidatorReader.h
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Validators.cpp
src/PartSet/PartSet_Validators.h
src/PartSet/icons/tangent.png
src/SketchPlugin/SketchPlugin_Plugin.cpp
src/SketchPlugin/plugin-Sketch.xml