SALOME platform Git repositories - modules/shaper.git/commit

author	azv <azv@opencascade.com>
	Wed, 20 Nov 2019 07:38:11 +0000 (10:38 +0300)
committer	azv <azv@opencascade.com>
	Wed, 20 Nov 2019 07:43:12 +0000 (10:43 +0300)
commit	d588149317acbc2bd8e6ceb00f8e82e806571775
tree	e2e8a8715ed7ebf704ce25141521d363fa068389	tree \| snapshot
parent	10f21d0cd6ce43b0af22c6e9ee436bc6a08ea5fa	commit \| diff
parent	8d04b5f4360b23cf376beff9c5e7c12d0e6a5f1e	commit \| diff

Merge remote-tracking branch 'remotes/origin/master' into CEA_2019

# Conflicts:
# CMakeLists.txt
# src/BuildPlugin/BuildPlugin_msg_fr.ts
# src/CollectionPlugin/CollectionPlugin_msg_fr.ts
# src/ConstructionPlugin/ConstructionPlugin_msg_fr.ts
# src/FeaturesPlugin/FeaturesPlugin_Chamfer.cpp
# src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
# src/FiltersPlugin/CMakeLists.txt
# src/GeomAlgoAPI/CMakeLists.txt
# src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.cpp
# src/GeomAlgoAPI/GeomAlgoAPI_Chamfer.h
# src/PythonAddons/Test/TestcompoundVertices.py
# src/PythonAddons/macros/compoundVertices/feature.py
# src/PythonAddons/macros/compoundVertices/widget.xml
# src/PythonAddons/macros/importParameters/feature.py
# src/PythonAddons/macros/importParameters/importParameters.txt
# src/PythonAddons/macros/importParameters/widget.xml
# src/SHAPERGUI/SHAPERGUI_msg_fr.ts
# src/XGUI/XGUI_msg_fr.ts

CMakeLists.txt	diff1 \|	diff2 \|	blob \| history
src/ModuleBase/ModuleBase_Tools.cpp	diff1 \|	diff2 \|	blob \| history
src/PartSet/PartSet_SketcherMgr.cpp	diff1 \|	diff2 \|	blob \| history
src/XGUI/XGUI_Workshop.cpp	diff1 \|	diff2 \|	blob \| history