]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6
authorvsv <vitaly.smetannikov@opencascade.com>
Fri, 28 Nov 2014 16:22:44 +0000 (19:22 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Fri, 28 Nov 2014 16:22:44 +0000 (19:22 +0300)
commitd0cbbcaf8210321d065b0cf54a33288c8d77e462
tree77be5020dfe6e8b58557475f7462f3c78831b6c9
parentc6e961b67d7ebf0954263766bc07a6c4a2fa2297
parent529d04de051fa4925c38a461df1382f79950ced5
Merge branch 'Dev_0.6' of newgeom:newgeom into Dev_0.6

Conflicts:
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.cpp