Salome HOME
Merge from V6_main (04/10/2012) V7_0_0 V7_0_0rc1
authorvsr <vsr@opencascade.com>
Mon, 8 Oct 2012 14:05:59 +0000 (14:05 +0000)
committervsr <vsr@opencascade.com>
Mon, 8 Oct 2012 14:05:59 +0000 (14:05 +0000)
commit477b7b7c83bbdc72658b0561639a253afb8ab62d
tree76378dcf3a447f652943ccbb42ff0320eedb673a
parent21cfe2851ba2836520525448262277c1ab2d6803
Merge from V6_main (04/10/2012)
106 files changed:
idl/Document.idl
idl/Edge.idl
idl/Hexa.idl
idl/Quad.idl
idl/Vertex.idl
internal_doc/index.html
src/HEXABLOCK/HexCylinder.cxx
src/HEXABLOCK/HexDocument_Xml.cxx
src/HEXABLOCK/HexEdge.cxx
src/HEXABLOCK/HexEdge.hxx
src/HEXABLOCK/HexElements.cxx
src/HEXABLOCK/HexElements_bis.cxx
src/HEXABLOCK/HexElements_grid.cxx
src/HEXABLOCK/HexElements_piq.cxx
src/HEXABLOCK/HexElements_ter.cxx
src/HEXABLOCK/HexEltBase.cxx
src/HEXABLOCK/HexEltBase.hxx
src/HEXABLOCK/HexHexa.cxx
src/HEXABLOCK/HexPipe.cxx
src/HEXABLOCK/HexQuad.cxx
src/HEXABLOCK/HexQuad.hxx
src/HEXABLOCK/hexa_base.hxx
src/HEXABLOCKGUI/CutEdge_QTD.ui
src/HEXABLOCKGUI/Cylinder_QTD.ui
src/HEXABLOCKGUI/Disconnect_QTD.ui
src/HEXABLOCKGUI/EdgeAssoc_QTD.ui
src/HEXABLOCKGUI/Edge_QTD.ui
src/HEXABLOCKGUI/Group_QTD.ui
src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentDelegate.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentGraphicView.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentGraphicView.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentItem.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentModel.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentPanel.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI_DocumentSelectionModel.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.cxx
src/HEXABLOCKGUI/HEXABLOCKGUI_SalomeTools.hxx
src/HEXABLOCKGUI/HEXABLOCKGUI_Trace.cxx
src/HEXABLOCKGUI/Hexa_QTD.ui
src/HEXABLOCKGUI/JoinQuad_QTD.ui
src/HEXABLOCKGUI/Law_QTD.ui
src/HEXABLOCKGUI/MakeCartesian_QTD.ui
src/HEXABLOCKGUI/MakeCylinder_QTD.ui
src/HEXABLOCKGUI/MakeCylinders_QTD.ui
src/HEXABLOCKGUI/MakeCylindrical_QTD.ui
src/HEXABLOCKGUI/MakeGrid_QTD.ui
src/HEXABLOCKGUI/MakeHemiSphere_QTD.ui
src/HEXABLOCKGUI/MakePipe_QTD.ui
src/HEXABLOCKGUI/MakePipes_QTD.ui
src/HEXABLOCKGUI/MakeRind_QTD.ui
src/HEXABLOCKGUI/MakeSpherical_QTD.ui
src/HEXABLOCKGUI/MakeTranslation_QTD.ui
src/HEXABLOCKGUI/MergeEdges_QTD.ui
src/HEXABLOCKGUI/MergeVertices_QTD.ui
src/HEXABLOCKGUI/Merge_QTD.ui
src/HEXABLOCKGUI/MyBasicGUI_PointDlg.cxx
src/HEXABLOCKGUI/MyBasicGUI_PointDlg.hxx
src/HEXABLOCKGUI/MyGEOMBase_Helper.hxx
src/HEXABLOCKGUI/MyGEOMBase_Skeleton.cxx
src/HEXABLOCKGUI/MyGEOMBase_Skeleton.hxx
src/HEXABLOCKGUI/Pipe_QTD.ui
src/HEXABLOCKGUI/PrismQuad_QTD.ui
src/HEXABLOCKGUI/Propagation_QTD.ui
src/HEXABLOCKGUI/QuadAssoc_QTD.ui
src/HEXABLOCKGUI/QuadRevolution_QTD.ui
src/HEXABLOCKGUI/Quad_QTD.ui
src/HEXABLOCKGUI/RemoveHexa_QTD.ui
src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
src/HEXABLOCKGUI/Symmetry_QTD.ui
src/HEXABLOCKGUI/Transformation_QTD.ui
src/HEXABLOCKGUI/Vector_QTD.ui
src/HEXABLOCKGUI/Vertex_QTD.ui
src/HEXABLOCK_I/HEXABLOCK.cxx
src/HEXABLOCK_I/HexDocument_impl.cxx
src/HEXABLOCK_I/HexDocument_impl.hxx
src/HEXABLOCK_I/HexEdge_impl.cxx
src/HEXABLOCK_I/HexEdge_impl.hxx
src/HEXABLOCK_I/HexHexa_impl.cxx
src/HEXABLOCK_I/HexHexa_impl.hxx
src/HEXABLOCK_I/HexQuad_impl.cxx
src/HEXABLOCK_I/HexQuad_impl.hxx
src/HEXABLOCK_I/HexVertex_impl.cxx
src/HEXABLOCK_I/HexVertex_impl.hxx
src/TEST_PY/INTER_3_CYLINDRE.py [deleted file]
src/TEST_PY/Makefile.am
src/TEST_PY/TUYAU_COURBE.py [deleted file]
src/TEST_PY/Test_HEXABLOCK.py [deleted file]
src/TEST_PY/bielle.py [deleted file]
src/TEST_PY/bielle_variante.py [deleted file]
src/TEST_PY/bride.py [deleted file]
src/TEST_PY/foo.py [new file with mode: 0644]
src/TEST_PY/recettes/cuve.py
src/TEST_PY/test_BIELLE_bad_assoc.py [deleted file]
src/TEST_PY/test_BIELLE_no_assoc.py [deleted file]
src/TEST_PY/test_HEXABLOCK.py [deleted file]
src/TEST_PY/test_INTER_3_CYLINDRE_no_assoc.py [deleted file]
src/TEST_PY/test_TUYAU_COURBE_no_assoc.py [deleted file]
src/TEST_PY/test_TUYAU_COURBE_weird_assoc.py [deleted file]
src/TEST_PY/test_distrib.py [deleted file]