Salome HOME
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0
authornds <natalia.donis@opencascade.com>
Fri, 27 Mar 2015 07:42:07 +0000 (10:42 +0300)
committernds <natalia.donis@opencascade.com>
Fri, 27 Mar 2015 07:42:07 +0000 (10:42 +0300)
commit762c91644fd2b5eeb99e7ad783b844b565e9ae9d
tree40c37f734758274f74c243a54b4d285b054e7b81
parent3e3d76500389cb3a5a6eeb09f229cd3c83730dac
parent2d1be67088b0864e4511036dfc51eded0dfb7822
Merge branch 'Dev_1.1.0' of newgeom:newgeom into Dev_1.1.0

Conflicts:
src/SketchPlugin/SketchPlugin_Validators.cpp
src/SketchPlugin/SketchPlugin_Validators.cpp