Merge branch 'master' of newgeom:newgeom

author vsv <vitaly.smetannikov@opencascade.com>

Tue, 24 Jun 2014 11:17:20 +0000 (15:17 +0400)

committer vsv <vitaly.smetannikov@opencascade.com>

Tue, 24 Jun 2014 11:17:20 +0000 (15:17 +0400)
author vsv <vitaly.smetannikov@opencascade.com>
Tue, 24 Jun 2014 11:17:20 +0000 (15:17 +0400)
committer vsv <vitaly.smetannikov@opencascade.com>
Tue, 24 Jun 2014 11:17:20 +0000 (15:17 +0400)
diff --cc src/Config/Config_Keywords.h
Simple merge
diff --cc src/PartSet/PartSet_OperationFeatureCreate.cpp
Simple merge
diff --cc src/SketchPlugin/plugin-Sketch.xml
Simple merge
author	vsv <vitaly.smetannikov@opencascade.com>
	Tue, 24 Jun 2014 11:17:20 +0000 (15:17 +0400)
committer	vsv <vitaly.smetannikov@opencascade.com>
	Tue, 24 Jun 2014 11:17:20 +0000 (15:17 +0400)
		1	2
src/Config/Config_Keywords.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/PartSet/PartSet_OperationFeatureCreate.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/SketchPlugin/plugin-Sketch.xml	patch \|	diff1 \|	diff2 \|	blob \| history