From: mpv <mpv@opencascade.com>
Date: Wed, 25 Mar 2015 09:08:24 +0000 (+0300)
Subject: Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
X-Git-Tag: V_1.1.0~89
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c44da4cdb21b305f2350bb4b2c9044eaba08f171;p=modules%2Fshaper.git

Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
	src/SketchPlugin/SketchPlugin_Sketch.cpp
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 789636f2a..bb42d8b4a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ IF(UNIX)
 ENDIF(UNIX)
 
 #IF(CMAKE_BUILD_TYPE MATCHES Release)
-  ADD_SUBDIRECTORY (doc)
+ADD_SUBDIRECTORY (doc)
 #ENDIF(CMAKE_BUILD_TYPE MATCHES Release)
 ADD_SUBDIRECTORY (src/Config)
 ADD_SUBDIRECTORY (src/Events)
@@ -65,6 +65,7 @@ ADD_SUBDIRECTORY (src/GeomApp)
 ADD_SUBDIRECTORY (src/ExchangePlugin)
 ADD_SUBDIRECTORY (src/GeomValidators)
 ADD_SUBDIRECTORY (src/InitializationPlugin)
+ADD_SUBDIRECTORY (src/ParametersPlugin)
 
 IF(${HAVE_SALOME})
     ADD_SUBDIRECTORY (src/NewGeom)
diff --git a/src/PartSet/icons/tangent.png b/src/PartSet/icons/tangent.png
index 971e919d2..4ca486e87 100644
Binary files a/src/PartSet/icons/tangent.png and b/src/PartSet/icons/tangent.png differ