]> SALOME platform Git repositories - modules/shaper.git/commit - src/FeaturesPlugin/Test/Test2686.py
Salome HOME
Merge remote-tracking branch 'remotes/origin/occ/compounds_processing' V9_5_0a1
authorazv <azv@opencascade.com>
Wed, 26 Feb 2020 13:22:38 +0000 (16:22 +0300)
committerazv <azv@opencascade.com>
Wed, 26 Feb 2020 13:22:38 +0000 (16:22 +0300)
commit6a23207a9154dac27c710190281aa5bfcf2bd498
treed3f33e9dad2ad240423631ea4d2a6af2fe7108c6
parent5cb545fd74fe756fb73c2c2eb94bd7b69ecebcce
parent4bc963e2f9b2a904df0e1e17f7f98b70957630bc
Merge remote-tracking branch 'remotes/origin/occ/compounds_processing'

# Conflicts:
# src/FeaturesPlugin/CMakeLists.txt
src/FeaturesPlugin/CMakeLists.txt
src/Model/Model_Data.cpp
src/ModelAPI/ModelAPI_Tools.cpp
src/ModelAPI/ModelAPI_Tools.h
src/ModelHighAPI/ModelHighAPI_Dumper.cpp