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 789636f2afb261daeeb20d5ab08302d473979efc..bb42d8b4a6480861724889642a7b0d689e5dc0af 100644 (file)
--- 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 971e919d20d89067acd7429afb31d97cd48be709..4ca486e87c9a76f65b3061579dbc94a98ff77567 100644 (file)
Binary files a/src/PartSet/icons/tangent.png and b/src/PartSet/icons/tangent.png differ