Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Thu, 22 May 2014 14:32:07 +0000 (18:32 +0400)
committernds <natalia.donis@opencascade.com>
Thu, 22 May 2014 14:32:07 +0000 (18:32 +0400)
commitad247cf594a7a560b656c70c96e1b1a360b8c1c3
tree4c8704217adfb2692ce23de09157c17d6ee75858
parent3965e179785e99fa48ce1cd0e49bf625401ace37
parentd0350421b47740df5540b8165ac7643657cccf66
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_OperationEditLine.cpp
src/PartSet/PartSet_OperationEditLine.cpp
src/PartSet/PartSet_OperationEditLine.h
src/PartSet/PartSet_OperationSketch.cpp
src/PartSet/PartSet_OperationSketchBase.cpp
src/PartSet/PartSet_OperationSketchBase.h
src/PartSet/PartSet_OperationSketchLine.cpp
src/PartSet/PartSet_OperationSketchLine.h