From: Clarisse Genrault <clarisse.genrault@cea.fr>
Date: Fri, 24 Jun 2016 08:23:51 +0000 (+0200)
Subject: Merge branch 'master' into cgt/V240
X-Git-Tag: V_2.4.1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d02cbd788a848f0d5cc7c9f3b4877f6b024a09f7;p=modules%2Fshaper.git

Merge branch 'master' into cgt/V240

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

d02cbd788a848f0d5cc7c9f3b4877f6b024a09f7
diff --cc src/GeomAlgoAPI/CMakeLists.txt
index 588c88507,7d05409ac..ee42e2a90
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -39,10 -39,8 +39,12 @@@ SET(PROJECT_HEADER
      GeomAlgoAPI_WireBuilder.h
      GeomAlgoAPI_Sewing.h
      GeomAlgoAPI_ShapeBuilder.h
 +    GeomAlgoAPI_DirectAPI.h
 +    GeomAlgoAPI_Exception.h
 +    GeomAlgoAPI_Box.h
 +    GeomAlgoAPI_BoxPoints.h
+     GeomAlgoAPI_XAOExport.h
+     GeomAlgoAPI_XAOImport.h
  )
  
  SET(PROJECT_SOURCES
@@@ -78,10 -76,8 +80,12 @@@
      GeomAlgoAPI_WireBuilder.cpp
      GeomAlgoAPI_Sewing.cpp
      GeomAlgoAPI_ShapeBuilder.cpp
 +    GeomAlgoAPI_DirectAPI.cpp
 +    GeomAlgoAPI_Exception.cpp
 +    GeomAlgoAPI_Box.cpp
 +    GeomAlgoAPI_BoxPoints.cpp
+     GeomAlgoAPI_XAOExport.cpp
+     GeomAlgoAPI_XAOImport.cpp
  )
  
  SET(PROJECT_LIBRARIES