From: mpv <mikhail.ponikarov@opencascade.com>
Date: Wed, 23 Apr 2014 04:23:41 +0000 (+0400)
Subject: Merge branch 'master' of newgeom:newgeom
X-Git-Tag: V_0.2~137
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=69be9f7dcd37595b9b98c9839c77105f2e704def;hp=-c;p=modules%2Fshaper.git

Merge branch 'master' of newgeom:newgeom

Conflicts:
	CMakeLists.txt
	src/Config/CMakeLists.txt
	src/Config/plugins.xml
	src/PartSet/CMakeLists.txt
	src/SketchPlugin/CMakeLists.txt
	src/SketchPlugin/SketchPlugin_Sketch.cpp
	src/SketchPlugin/SketchPlugin_Sketch.h
---

69be9f7dcd37595b9b98c9839c77105f2e704def
diff --combined CMakeLists.txt
index dc4b8fd19,9656d18f2..68d585725
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -25,8 -25,7 +25,9 @@@ ADD_SUBDIRECTORY (src/ModelAPI
  ADD_SUBDIRECTORY (src/ModuleBase)
  ADD_SUBDIRECTORY (src/PartSet)
  ADD_SUBDIRECTORY (src/PartSetPlugin)
 +ADD_SUBDIRECTORY (src/ConstructionPlugin)
 +ADD_SUBDIRECTORY (src/SketchPlugin)
+ ADD_SUBDIRECTORY (src/SketchPlugin)
  ADD_SUBDIRECTORY (src/PyConsole)
  ADD_SUBDIRECTORY (src/PyEvent)
  ADD_SUBDIRECTORY (src/PyInterp)