Salome HOME
Merge branch 'master' of newgeom:newgeom
authorszy <szy@opencascade.com>
Mon, 27 Oct 2014 15:48:46 +0000 (18:48 +0300)
committerszy <szy@opencascade.com>
Mon, 27 Oct 2014 15:48:46 +0000 (18:48 +0300)
commitd9db5498b576854aae37ddf8c0bb6fceb264712e
tree7e80fa4e1bee3e13533a6d1d8b660cba4dd58bd2
parent5f2ce61eb2866c9b2d119f0ad4c8301f765304ee
parentd2c592943592ae2d6118e1881ea899df81d692dc
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/GeomAPI/GeomAPI_Shape.h
src/FeaturesPlugin/FeaturesPlugin_Extrusion.cpp
src/GeomAPI/GeomAPI_Shape.h
src/Model/Model_ResultBody.cpp
src/ModelAPI/ModelAPI_ResultBody.h