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:23:54 +0000 (17:23 +0300)
committernds <natalia.donis@opencascade.com>
Thu, 30 Apr 2015 14:23:54 +0000 (17:23 +0300)
commit8e54aaa6560497708620242e7f99a0d8e58366f7
tree0ed466a8d6b5a9d7ed66038dc48ad6ad0811b8e1
parent3b25b196c3d1fdd9bd14cfdc2dd06d3db2055c48
parent553edcf55fe11e07b09c35ee97f56f61cacc61c2
Merge branch 'Dev_1.2.0' of newgeom:newgeom into Dev_1.2.0

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