Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authorvsv <vitaly.smetannikov@opencascade.com>
Thu, 26 Mar 2015 13:44:06 +0000 (16:44 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Thu, 26 Mar 2015 13:44:06 +0000 (16:44 +0300)
commit7fcf163a8a369889707c5b73eeeb2bc68a4b906e
tree713bd6e33a516b1afbc4a325b36c5a50e8fa7cf4
parent5bca4c3cdc0e8fb3d6bd53b576c6ec6ad633d4b3
parenta731f82dccbfdb67cbf8e8d617222a4d3e32018a
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Validators.cpp
src/SketchPlugin/SketchPlugin_Validators.h
src/SketchPlugin/plugin-Sketch.xml