Salome HOME
Merge from BR_OPENCV
authorgdd <gdd>
Tue, 8 Nov 2011 13:40:30 +0000 (13:40 +0000)
committergdd <gdd>
Tue, 8 Nov 2011 13:40:30 +0000 (13:40 +0000)
commitc8ae1da7b2988de253fec52eb7583a5b0f291209
treec162e1b7cadd37f0986ebd1bc09d0ec8d9b9c1ff
parent9e901d3d5cd939160d718098e84a8fc11023a0b0
Merge from BR_OPENCV
31 files changed:
adm_local/unix/config_files/Makefile.am
configure.ac
resources/GEOM_en.xml
src/BasicGUI/Makefile.am
src/DisplayGUI/DisplayGUI.cxx
src/EntityGUI/EntityGUI.cxx
src/EntityGUI/EntityGUI.h
src/EntityGUI/EntityGUI_FeatureDetectorDlg.cxx [new file with mode: 0644]
src/EntityGUI/EntityGUI_FeatureDetectorDlg.h [new file with mode: 0644]
src/EntityGUI/EntityGUI_PictureImportDlg.cxx [new file with mode: 0644]
src/EntityGUI/EntityGUI_PictureImportDlg.h [new file with mode: 0644]
src/EntityGUI/EntityGUI_SketcherDlg.cxx
src/EntityGUI/Makefile.am
src/GEOMBase/GEOMBase_Helper.cxx
src/GEOMBase/Makefile.am
src/GEOMGUI/GEOM_Displayer.cxx
src/GEOMGUI/GEOM_Displayer.h
src/GEOMGUI/GEOM_msg_en.ts
src/GEOMGUI/GEOM_msg_fr.ts
src/GEOMGUI/GeometryGUI.cxx
src/GEOMGUI/GeometryGUI_Operations.h
src/GEOMGUI/Makefile.am
src/GEOMToolsGUI/GEOMToolsGUI.cxx
src/GEOMToolsGUI/GEOMToolsGUI.h
src/GEOMToolsGUI/GEOMToolsGUI_1.cxx
src/Makefile.am
src/OBJECT/GEOM_AISShape.cxx
src/OperationGUI/Makefile.am
src/ShapeRecognition/Makefile.am [new file with mode: 0644]
src/ShapeRecognition/ShapeRec_FeatureDetector.cxx [new file with mode: 0644]
src/ShapeRecognition/ShapeRec_FeatureDetector.hxx [new file with mode: 0644]