]> SALOME platform Git repositories - modules/shaper.git/commit - src/XGUI/XGUI_SelectionMgr.cpp
Salome HOME
Merge branch 'BR_internationalization'
authorvsv <vitaly.smetannikov@opencascade.com>
Tue, 7 Jun 2016 09:31:09 +0000 (12:31 +0300)
committervsv <vitaly.smetannikov@opencascade.com>
Tue, 7 Jun 2016 09:31:09 +0000 (12:31 +0300)
commita8cfbfb436c27ff96edd5c808e9a452c35cef207
tree56eb07743e56169ab2867fb7df42b3a8aae5f13d
parentccc0161508d69be20d6a2114b4ce4d401bd5636f
parent1caca4db4cda17236f7a9f50fc9c620f6a426372
Merge branch 'BR_internationalization'

Conflicts:
src/Model/Model_SelectionNaming.cpp
src/ModuleBase/ModuleBase_Tools.cpp
18 files changed:
src/BuildPlugin/BuildPlugin_Wire.cpp
src/Config/CMakeLists.txt
src/FeaturesPlugin/FeaturesPlugin_Validators.cpp
src/GeomValidators/GeomValidators_ShapeType.cpp
src/Model/Model_Document.cpp
src/Model/Model_SelectionNaming.cpp
src/Model/Model_Update.cpp
src/ModuleBase/ModuleBase_ResultPrs.cpp
src/ModuleBase/ModuleBase_Tools.cpp
src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
src/PartSet/PartSet_OperationPrs.cpp
src/PartSet/PartSet_ResultSketchPrs.cpp
src/SketchSolver/SketchSolver_Group.cpp
src/XGUI/XGUI_DataModel.cpp
src/XGUI/XGUI_ModuleConnector.cpp
src/XGUI/XGUI_ObjectsBrowser.cpp
src/XGUI/XGUI_Tools.cpp
src/XGUI/XGUI_Workshop.cpp