Salome HOME
Merge branch 'BR_ADVANCED_CURRENT_FEATURE_MANAGEMENT' of salome:modules/shaper into...
authorvsv <vitaly.smetannikov@opencascade.com>
Fri, 9 Oct 2015 08:39:37 +0000 (11:39 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Fri, 9 Oct 2015 08:39:37 +0000 (11:39 +0300)
commit8c56aa1d9ce74e35df11472ab3542f6653a5ba51
tree909f0260abe78303bda269fc26d3a6c453997638
parenta9958035274c760e00d75f1e37781f9dfbf9a8ed
parentcdfb03d58ed695e291aa3b7cd3c342051e18e444
Merge branch 'BR_ADVANCED_CURRENT_FEATURE_MANAGEMENT' of salome:modules/shaper into BR_ADVANCED_CURRENT_FEATURE_MANAGEMENT

Conflicts:
src/ModuleBase/ModuleBase_OperationFeature.cpp
src/ModuleBase/ModuleBase_OperationFeature.cpp