Salome HOME
Merge from BR_imps_2013 14/01/2014
authorvsr <vsr@opencascade.com>
Wed, 15 Jan 2014 09:27:18 +0000 (09:27 +0000)
committervsr <vsr@opencascade.com>
Wed, 15 Jan 2014 09:27:18 +0000 (09:27 +0000)
commit8a4e7650033604e2ddb8bb228ef57706914f56f5
tree54f546d947234acf65fe8dd69b5b5f2e731e7de6
parent94bd279e02694a521884b74a5b695730a809088b
Merge from BR_imps_2013 14/01/2014
39 files changed:
resources/CMakeLists.txt
resources/SalomeApp.xml.in
resources/managedimensions.png [new file with mode: 0644]
src/EntityGUI/EntityGUI_3DSketcherDlg.cxx
src/GEOMGUI/CMakeLists.txt
src/GEOMGUI/GEOMGUI_DimensionProperty.cxx [new file with mode: 0644]
src/GEOMGUI/GEOMGUI_DimensionProperty.h [new file with mode: 0644]
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GEOM_Displayer.h
src/GEOMGUI/GEOM_images.ts
src/GEOMGUI/GEOM_msg_en.ts
src/GEOMGUI/GEOM_msg_fr.ts
src/GEOMGUI/GEOM_msg_ja.ts
src/GEOMGUI/GeometryGUI.cxx
src/GEOMGUI/GeometryGUI_Operations.h
src/MeasureGUI/CMakeLists.txt
src/MeasureGUI/MeasureGUI.cxx
src/MeasureGUI/MeasureGUI_1Sel_Frame_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_1TreeWidget_4Button_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_2Sel_Frame_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_3Sel_Frame_QTD.ui [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_AngleDlg.cxx
src/MeasureGUI/MeasureGUI_CreateDimensionDlg.cxx [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_CreateDimensionDlg.h [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_DimensionCreateTool.cxx [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_DimensionCreateTool.h [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_DimensionFilter.cxx [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_DimensionFilter.h [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_DimensionInteractor.cxx [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_DimensionInteractor.h [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.cxx [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_ManageDimensionsDlg.h [new file with mode: 0644]
src/MeasureGUI/MeasureGUI_Widgets.cxx
src/MeasureGUI/MeasureGUI_Widgets.h
src/OBJECT/CMakeLists.txt
src/OBJECT/GEOM_AISDimension.cxx [new file with mode: 0755]
src/OBJECT/GEOM_AISDimension.hxx [new file with mode: 0755]
src/OBJECT/GEOM_Constants.cxx
src/OBJECT/GEOM_Constants.h