From: vsv <vsv@opencascade.com>
Date: Mon, 7 Oct 2019 12:30:45 +0000 (+0300)
Subject: Merge remote-tracking branch 'origin/CEA_2019'
X-Git-Tag: V9_4_0a2~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3c987a8d1b88765224e3ac1388afb91eae17e4d3;p=modules%2Fshaper.git

Merge remote-tracking branch 'origin/CEA_2019'

# Conflicts:
#	src/GeomAlgoAPI/CMakeLists.txt
---

3c987a8d1b88765224e3ac1388afb91eae17e4d3
diff --cc src/GeomAlgoAPI/CMakeLists.txt
index e80d9cf29,460aebe7e..235851975
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -142,7 -142,7 +142,8 @@@ SET(PROJECT_SOURCE
      GeomAlgoAPI_Offset.cpp
      GeomAlgoAPI_SolidClassifier.cpp
      GeomAlgoAPI_MapShapesAndAncestors.cpp
+     GeomAlgoAPI_Projection.cpp
 +    GeomAlgoAPI_Chamfer.cpp
  )
  
  SET(PROJECT_LIBRARIES