From c44da4cdb21b305f2350bb4b2c9044eaba08f171 Mon Sep 17 00:00:00 2001
From: mpv <mpv@opencascade.com>
Date: Wed, 25 Mar 2015 12:08:24 +0300
Subject: [PATCH] Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
	src/SketchPlugin/SketchPlugin_Sketch.cpp
---
 CMakeLists.txt                |   3 ++-
 src/PartSet/icons/tangent.png | Bin 365 -> 433 bytes
 2 files changed, 2 insertions(+), 1 deletion(-)

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 971e919d20d89067acd7429afb31d97cd48be709..4ca486e87c9a76f65b3061579dbc94a98ff77567 100644
GIT binary patch
delta 348
zcmV-i0i*uy0<i;-JPN`901m<d6(~x8kwzwe0WV2JK~y+TeUc$k13?f)S42caL`FnJ
zq*fs~0tY}uL`0%f5eRO;Q8)ksfj}UFi^u_x2n2#kAtRdqW_w8Q>;~~_tNZ`%ot~b`
z%>JdS?LxeZA92~y%S1#4OD{CB7qgD1Or&IO199(#@E}IL-cF*nv3T~vqqr+Qk#^vJ
z^V+(i_#ocImmuc*C>E`nP@LwaIHUL+Pa=)fH}9txe~Vi&^&d<<CXfCq1_*IpE-N(=
z^L)ApdDrpXkYG(DuEbU#ton*G=<eGRT#I~6PJz%~8Fvz5boU)krbfsOhJX2RslhjN
zU#G#&g=Nh5oPdqt+nr2}uyNr-q_Ijz$h(ejQ;MvV^&s+aXgG0g;&Fah%^G6^H}aHU
u+;k4~aq^c9GBPX#ZzMk)zQo}vTlEXvK3ltF(9f3u0000<MNUMnLSTYHd!J(f

delta 280
zcmV+z0q6d)1MLEkJPN@801m+cxRGn^kwzwe0P9IaK~y+Tg^?i=!Y~j;J5W(kiNIkx
zIR&BzK=crZasvc{84kcvI06E}5fF$91QJhy<!`frG)+_SGTF`lKRZc8L>=C%=;iDC
z=rmk&q$mYzZ~!-f_uNZ|%sHq4^-v9&jqn5(U?TAT2zt%4XE`?JJ&5gd(Zpca6mCF&
zU5-8+AR#}qt7Ck(XP_2yX8No%wDfk-H1rEMqq}F`30j4sxtJedYM=GdF3ig++S>gP
z|Ba$T%y*F3q7Zt~UviOv(iMf!i=w5Nub}hiA=sP%9-9LSpC|+eY{Y!_35MVR{xS~8
eeS$C)eF34;ob;>S9Z3KH002ovPDHK)LSTYj<9s#%

-- 
2.39.2