]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0
authornds <natalia.donis@opencascade.com>
Thu, 30 Apr 2015 14:34:41 +0000 (17:34 +0300)
committernds <natalia.donis@opencascade.com>
Thu, 30 Apr 2015 14:34:41 +0000 (17:34 +0300)
commit69eda51b90e5601d1cde7d9f64d3203c44287366
treec7222ab5bdb115e779027e10d09826118178981c
parent8e54aaa6560497708620242e7f99a0d8e58366f7
Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

Conflicts:
src/PartSet/PartSet_Module.cpp
src/SketchPlugin/plugin-Sketch.xml