Salome HOME
Merge remote-tracking branch 'origin/CEA_2019'
authorvsv <vsv@opencascade.com>
Mon, 7 Oct 2019 12:30:45 +0000 (15:30 +0300)
committervsv <vsv@opencascade.com>
Mon, 7 Oct 2019 12:30:45 +0000 (15:30 +0300)
commit3c987a8d1b88765224e3ac1388afb91eae17e4d3
tree768d06f3e64f0573c683d35b141ceaed184ae381
parent86715ebd4faabb1f88278e443e90a72d7d75e6cc
parent1942d1ece970efdd4d9472de9f7e513671c23a77
Merge remote-tracking branch 'origin/CEA_2019'

# Conflicts:
# src/GeomAlgoAPI/CMakeLists.txt
src/FeaturesPlugin/CMakeLists.txt
src/FeaturesPlugin/plugin-Features.xml
src/GeomAlgoAPI/CMakeLists.txt