From: sbh <sergey.belash@opencascade.com>
Date: Thu, 2 Apr 2015 11:01:28 +0000 (+0300)
Subject: Merge branch 'BR_DEBIAN_RUNTIME' of newgeom:newgeom.git into Dev_1.1.0
X-Git-Tag: V_1.1.0~57^2~25^2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ed3006032ada5642cbd0b1152c01170c815526a6;p=modules%2Fshaper.git

Merge branch 'BR_DEBIAN_RUNTIME' of newgeom:newgeom.git into Dev_1.1.0
---

ed3006032ada5642cbd0b1152c01170c815526a6
diff --cc src/SketcherPrs/SketcherPrs_Coincident.h
index 72c7ec5d0,10d0c72c1..5aaf5d635
--- a/src/SketcherPrs/SketcherPrs_Coincident.h
+++ b/src/SketcherPrs/SketcherPrs_Coincident.h
@@@ -45,9 -44,8 +44,9 @@@ protected
      const Standard_Integer aMode) ;
  
  private:
-   SketchPlugin_Constraint* myConstraint;
+   ModelAPI_Feature* myConstraint;
    std::shared_ptr<GeomAPI_Ax3> myPlane;
 +  gp_Pnt myPoint;
  };