Salome HOME
Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1
authorvsv <vitaly.smetannikov@opencascade.com>
Mon, 22 Dec 2014 09:45:48 +0000 (12:45 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Mon, 22 Dec 2014 09:45:48 +0000 (12:45 +0300)
commita07cdcdf600fc224bc862686439dfbe01d72524a
treee62b8e65140fbf7489bb842c06c7998bb44ec42f
parent47ed5645c9784f62ffe5d706a0d48539f192beb0
parent813c83e36bc7fcd622419767e6a409ceba98a912
Merge branch 'Dev_0.6.1' of newgeom:newgeom into Dev_0.6.1

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