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

author vsv <vitaly.smetannikov@opencascade.com>

Wed, 11 Mar 2015 09:33:51 +0000 (12:33 +0300)

committer vsv <vitaly.smetannikov@opencascade.com>

Wed, 11 Mar 2015 09:33:51 +0000 (12:33 +0300)
author vsv <vitaly.smetannikov@opencascade.com>
Wed, 11 Mar 2015 09:33:51 +0000 (12:33 +0300)
committer vsv <vitaly.smetannikov@opencascade.com>
Wed, 11 Mar 2015 09:33:51 +0000 (12:33 +0300)
diff --cc src/SketchPlugin/CMakeLists.txt
Simple merge
diff --cc src/SketchPlugin/SketchPlugin_Sketch.cpp
Simple merge
diff --cc src/SketchPlugin/plugin-Sketch.xml
Simple merge
author	vsv <vitaly.smetannikov@opencascade.com>
	Wed, 11 Mar 2015 09:33:51 +0000 (12:33 +0300)
committer	vsv <vitaly.smetannikov@opencascade.com>
	Wed, 11 Mar 2015 09:33:51 +0000 (12:33 +0300)
		1	2
src/SketchPlugin/CMakeLists.txt	patch \|	diff1 \|	diff2 \|	blob \| history
src/SketchPlugin/SketchPlugin_Sketch.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/SketchPlugin/plugin-Sketch.xml	patch \|	diff1 \|	diff2 \|	blob \| history