From: azv <azv@opencascade.com>
Date: Thu, 5 Jun 2014 11:09:28 +0000 (+0400)
Subject: Merge remote-tracking branch 'remotes/origin/master' into SketchSolver
X-Git-Tag: V_0.4.4~303^2^2^2~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=ae347a8a8014a15245199a3bb603413628e3f7d4;p=modules%2Fshaper.git

Merge remote-tracking branch 'remotes/origin/master' into SketchSolver

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

ae347a8a8014a15245199a3bb603413628e3f7d4
diff --cc src/GeomAlgoAPI/CMakeLists.txt
index 548f7002f,181bf09de..5822d61fb
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@@ -9,14 -8,14 +8,16 @@@ SET(PROJECT_HEADER
      GeomAlgoAPI_CompoundBuilder.h
      GeomAlgoAPI_FaceBuilder.h
      GeomAlgoAPI_EdgeBuilder.h
+     GeomAlgoAPI_PointBuilder.h
 +    GeomAlgoAPI_SketchBuilder.h
  )
  
  SET(PROJECT_SOURCES
      GeomAlgoAPI_CompoundBuilder.cpp
      GeomAlgoAPI_FaceBuilder.cpp
      GeomAlgoAPI_EdgeBuilder.cpp
+     GeomAlgoAPI_PointBuilder.cpp
 +    GeomAlgoAPI_SketchBuilder.cpp
  )
  
  ADD_DEFINITIONS(-DGEOMALGOAPI_EXPORTS ${CAS_DEFINITIONS})