Salome HOME
Merge branch 'V7_dev'
authorvsr <vsr@opencascade.com>
Thu, 24 Mar 2016 12:55:14 +0000 (15:55 +0300)
committervsr <vsr@opencascade.com>
Thu, 24 Mar 2016 13:36:53 +0000 (16:36 +0300)
commitbd2042b4d19d69deaf182edda40bbff83e53490a
tree075bf02380f7383a359626c3f70a1d795178c106
parentdd9852af669aaab3552b9f9405ef6756ede1ed3b
parentcfa4be5d95ed4d518bdad2bdd7d6739e9da33d7b
Merge branch 'V7_dev'
46 files changed:
CMakeLists.txt
src/AdvancedGUI/CMakeLists.txt
src/BREPPlugin/CMakeLists.txt
src/BasicGUI/CMakeLists.txt
src/BlocksGUI/CMakeLists.txt
src/BooleanGUI/CMakeLists.txt
src/BuildGUI/BuildGUI_FaceDlg.cxx
src/BuildGUI/CMakeLists.txt
src/CurveCreator/CMakeLists.txt
src/CurveCreator/CurveCreator_TreeView.cxx
src/DependencyTree/CMakeLists.txt
src/DependencyTree/DependencyTree_Arrow.cxx
src/DisplayGUI/CMakeLists.txt
src/DlgRef/CMakeLists.txt
src/EntityGUI/CMakeLists.txt
src/GEOMBase/CMakeLists.txt
src/GEOMFiltersSelection/CMakeLists.txt
src/GEOMGUI/CMakeLists.txt
src/GEOMGUI/GEOMGUI_CreationInfoWdg.cxx
src/GEOMGUI/GEOMGUI_TextTreeWdg.cxx
src/GEOMToolsGUI/CMakeLists.txt
src/GEOMToolsGUI/GEOMToolsGUI_PublishDlg.cxx
src/GEOMToolsGUI/GEOMToolsGUI_ReduceStudyDlg.cxx
src/GenerationGUI/CMakeLists.txt
src/GroupGUI/CMakeLists.txt
src/IGESPlugin/CMakeLists.txt
src/Material/CMakeLists.txt
src/MeasureGUI/CMakeLists.txt
src/OBJECT/CMakeLists.txt
src/OCC2VTK/CMakeLists.txt
src/OperationGUI/CMakeLists.txt
src/PrimitiveGUI/CMakeLists.txt
src/RepairGUI/CMakeLists.txt
src/RepairGUI/RepairGUI.cxx
src/RepairGUI/RepairGUI_InspectObjectDlg.cxx
src/STEPPlugin/CMakeLists.txt
src/STEPPlugin/STEPPlugin_ImportDlg.cxx
src/STLPlugin/CMakeLists.txt
src/ShapeRecognition/CMakeLists.txt
src/Tools/geom_plugins.py
src/Tools/t_shape/CMakeLists.txt
src/Tools/t_shape/t_shape_dialog.py
src/Tools/t_shape/t_shape_progress.py
src/TransformationGUI/CMakeLists.txt
src/VTKPlugin/CMakeLists.txt
src/XAOPlugin/CMakeLists.txt