Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authormpv <mpv@opencascade.com>
Wed, 25 Mar 2015 09:00:51 +0000 (12:00 +0300)
committermpv <mpv@opencascade.com>
Wed, 25 Mar 2015 09:00:51 +0000 (12:00 +0300)
commit9bea53a5d0fc5c6aec52f4732ec45a9dcbe7354d
treec1cf602b43d2077af916357e761d9f94b5069e02
parent3434ba03d87d81dafe16854585af966572c367f1
parentc7f578893a15f81349d32556b3501c44763e9418
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Sketch.cpp
src/GeomAPI/GeomAPI_AISObject.cpp
src/GeomAlgoAPI/GeomAlgoAPI_Placement.cpp
src/Model/Model_AttributeRefList.cpp
src/Model/Model_AttributeReference.cpp
src/Model/Model_AttributeSelection.cpp
src/SketchPlugin/SketchPlugin_Arc.cpp
src/SketchPlugin/SketchPlugin_Circle.cpp
src/SketchPlugin/SketchPlugin_Line.cpp
src/SketchPlugin/SketchPlugin_Point.cpp
src/SketchPlugin/SketchPlugin_Sketch.cpp