]> SALOME platform Git repositories - modules/shaper.git/commit
Salome HOME
Merge branch 'master' of newgeom:newgeom.git
authorsbh <sergey.belash@opencascade.com>
Thu, 24 Apr 2014 12:02:38 +0000 (16:02 +0400)
committersbh <sergey.belash@opencascade.com>
Thu, 24 Apr 2014 12:02:38 +0000 (16:02 +0400)
commit6654a921211670c15a79a997ca666a174fe8a6f6
tree67135371f2e553a97c0402df393bc68b6324a745
parente2e9a14b1e74a37bf804b665c728ab71cc2f6e26
parentf11baf398313d8250c878ef7923879c527d1c0e1
Merge branch 'master' of newgeom:newgeom.git

Conflicts:
src/PartSet/PartSet_Module.cpp
src/Config/Config_FeatureReader.cpp
src/Config/Config_XMLReader.cpp
src/Model/Model_PluginManager.cpp
src/PartSet/PartSet_Module.cpp
src/PartSet/PartSet_Module.h