]> SALOME platform Git repositories - modules/shaper.git/commitdiff
Salome HOME
Merge branch 'master' of newgeom:newgeom
authornds <natalia.donis@opencascade.com>
Wed, 29 Oct 2014 14:45:16 +0000 (17:45 +0300)
committernds <natalia.donis@opencascade.com>
Wed, 29 Oct 2014 14:45:16 +0000 (17:45 +0300)
Conflicts:
src/PartSet/PartSet_Tools.cpp

1  2 
src/PartSet/PartSet_Tools.cpp
src/PartSet/PartSet_Tools.h

Simple merge
Simple merge