From: vsv <vitaly.smetannikov@opencascade.com>
Date: Wed, 2 Apr 2014 12:40:42 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.1~41^2^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=499d70af8b5a0301b1d1260dc19455dc4fab7978;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

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

499d70af8b5a0301b1d1260dc19455dc4fab7978
diff --cc src/ModelAPI/CMakeLists.txt
index 0013e1b6a,950cbc530..47f665e53
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@@ -1,8 -1,9 +1,7 @@@
  CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
  
 -INCLUDE(Common)
  FIND_PACKAGE(SWIG REQUIRED)
  INCLUDE(${SWIG_USE_FILE})
- INCLUDE(FindBoost)
 -INCLUDE(FindPython)
  INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
  
  SET(PROJECT_HEADERS