From: sbh Date: Thu, 16 Apr 2015 14:56:13 +0000 (+0300) Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0 X-Git-Tag: V_1.1.0~21 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3ee83c7b4a29bfb47ad40090dea7cc27f80c2b47;hp=653805f5d615b18e3a5a9640a86ae55ba5779d69;p=modules%2Fshaper.git Merge branch 'Dev_1.1.0' of newgeom:newgeom.git into Dev_1.1.0 --- diff --git a/src/ConstructionPlugin/plugin-Construction.xml b/src/ConstructionPlugin/plugin-Construction.xml index 68a3e4e7c..aad7e762a 100644 --- a/src/ConstructionPlugin/plugin-Construction.xml +++ b/src/ConstructionPlugin/plugin-Construction.xml @@ -6,21 +6,21 @@ diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml index 6834cdbe6..7790b2839 100644 --- a/src/FeaturesPlugin/plugin-Features.xml +++ b/src/FeaturesPlugin/plugin-Features.xml @@ -16,7 +16,7 @@ diff --git a/src/PartSetPlugin/plugin-PartSet.xml b/src/PartSetPlugin/plugin-PartSet.xml index 721a69236..95f55c9a2 100644 --- a/src/PartSetPlugin/plugin-PartSet.xml +++ b/src/PartSetPlugin/plugin-PartSet.xml @@ -3,7 +3,7 @@ - + - + diff --git a/src/SketchPlugin/plugin-Sketch.xml b/src/SketchPlugin/plugin-Sketch.xml index 6d73ae816..d38f2ce69 100644 --- a/src/SketchPlugin/plugin-Sketch.xml +++ b/src/SketchPlugin/plugin-Sketch.xml @@ -8,30 +8,30 @@ nested="SketchPoint SketchLine SketchCircle SketchArc SketchConstraintLength SketchConstraintRadius SketchConstraintDistance SketchConstraintParallel SketchConstraintPerpendicular SketchConstraintRigid SketchConstraintHorizontal SketchConstraintVertical SketchConstraintEqual SketchConstraintTangent SketchConstraintFillet SketchConstraintCoincidence SketchConstraintMirror" when_nested="accept abort" title="Sketch" - tooltip="Create a new sketch" + tooltip="Create sketch" icon=":icons/sketch.png"> - + - + - + - +