Salome HOME
Merge branch 'master' of newgeom:newgeom
authormpv <mikhail.ponikarov@opencascade.com>
Tue, 18 Nov 2014 07:04:50 +0000 (10:04 +0300)
committermpv <mikhail.ponikarov@opencascade.com>
Tue, 18 Nov 2014 07:04:50 +0000 (10:04 +0300)
commit4783f146b71a48c651523fcf0e12367bcf3d1fa8
tree3fced34ae9f4c0fcfea7d29fe995bfe264f69319
parent0fcae5b2e143e67306603d26f0b5e01cbe33d2bb
parent77f1865209de7de71bf880d22f2ac3f8bce710d3
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/GeomAPI/GeomAPI_PlanarEdges.h
src/Model/Model_ResultConstruction.cpp
src/Model/Model_ResultConstruction.h
src/Model/Model_ResultGroup.cpp
src/Model/Model_ResultGroup.h
src/ModelAPI/ModelAPI_ResultBody.h
src/ModelAPI/ModelAPI_ResultConstruction.h
src/ModelAPI/ModelAPI_ResultGroup.h
src/ModelAPI/ModelAPI_Tools.cpp
14 files changed:
src/GeomAPI/GeomAPI_PlanarEdges.cpp
src/GeomAPI/GeomAPI_PlanarEdges.h
src/Model/Model_ResultConstruction.cpp
src/Model/Model_ResultConstruction.h
src/Model/Model_ResultGroup.cpp
src/Model/Model_ResultGroup.h
src/ModelAPI/ModelAPI_Feature.h
src/ModelAPI/ModelAPI_Result.h
src/ModelAPI/ModelAPI_ResultBody.h
src/ModelAPI/ModelAPI_ResultConstruction.h
src/ModelAPI/ModelAPI_ResultGroup.h
src/ModelAPI/ModelAPI_Tools.cpp
src/SketchPlugin/SketchPlugin_Feature.h
src/XGUI/XGUI_Workshop.h