From: sbh <sergey.belash@opencascade.com>
Date: Mon, 22 Dec 2014 16:37:04 +0000 (+0300)
Subject: Merge branch 'Dev_0.6.1' of newgeom:newgeom.git into BR_TEMP_PLUGIN
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dabd46d48c9aab36a705a88c1974acd325e7da17;p=modules%2Fshaper.git

Merge branch 'Dev_0.6.1' of newgeom:newgeom.git into BR_TEMP_PLUGIN

Conflicts:
	CMakeLists.txt
	src/Config/plugins.xml
---

dabd46d48c9aab36a705a88c1974acd325e7da17
diff --cc src/Config/plugins.xml
index 9dbb286b2,c763eb5bc..ab049d554
--- a/src/Config/plugins.xml
+++ b/src/Config/plugins.xml
@@@ -6,8 -6,7 +6,8 @@@
    <plugin library="ConstructionPlugin" configuration="plugin-Construction.xml"/>
    <plugin library="FeaturesPlugin" configuration="plugin-Features.xml"/>
    <plugin library="ExchangePlugin" configuration="plugin-Exchange.xml"/>
 +  <plugin library="TemplatePlugin_1" configuration="plugin-Template_1.xml"/>
    <plugin library="SketchSolver"/>
    <plugin library="GeomValidators"/>
 -  <plugin library="DFBrowser" internal="true"/>
 +  <plugin library="DFBrowser"/>
- </plugins>
+ </plugins>