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)
commit5b841e9801c659d762d708378df8c4d85565fda0
treec58dc610f356505a67171744ab2794a8a7928b85
parent2e9a155145c3b05fa1f592edde88489c8521d029
parent45b81a6a0235d944f6324f5eaa591e4740af6eff
Merge branch 'master' of newgeom:newgeom

Conflicts:
src/PartSet/PartSet_Tools.cpp
src/PartSet/PartSet_Tools.cpp
src/PartSet/PartSet_Tools.h