Salome HOME
Merge from V6_main (04/10/2012) V7_0_0 V7_0_0rc1
authorvsr <vsr@opencascade.com>
Mon, 8 Oct 2012 13:10:21 +0000 (13:10 +0000)
committervsr <vsr@opencascade.com>
Mon, 8 Oct 2012 13:10:21 +0000 (13:10 +0000)
commit49fb797789d9300b06ac40ba8bd7f91b0e5c61e4
treed545403e80a90b9ee89b89908e2c3eb19797b9a3
parent2b75e64571580555caa6d2e62088ae5350ca7ec0
Merge from V6_main (04/10/2012)
26 files changed:
doc/salome/gui/GHS3DPLUGIN/Makefile.am
doc/salome/gui/GHS3DPLUGIN/doxyfile_py.in
doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_meshes.png
doc/salome/gui/GHS3DPLUGIN/images/ghs3d_enforced_vertices.png
doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_advanced.png
doc/salome/gui/GHS3DPLUGIN/images/ghs3d_parameters_basic.png
doc/salome/gui/GHS3DPLUGIN/input/ghs3d_hypo.doc
doc/salome/gui/GHS3DPLUGIN/input/ghs3dplugin_python_interface.doc
doc/salome/gui/GHS3DPLUGIN/input/index.doc
idl/GHS3DPlugin_Algorithm.idl
resources/GHS3DPlugin.xml
src/GHS3DPlugin/GHS3DPluginDC.py
src/GHS3DPlugin/GHS3DPlugin_GHS3D.cxx
src/GHS3DPlugin/GHS3DPlugin_GHS3D.hxx
src/GHS3DPlugin/GHS3DPlugin_Hypothesis.cxx
src/GHS3DPlugin/GHS3DPlugin_Hypothesis.hxx
src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.cxx
src/GHS3DPlugin/GHS3DPlugin_Hypothesis_i.hxx
src/GHS3DPlugin/Makefile.am
src/GHS3DPlugin/libmesh5.c [deleted file]
src/GHS3DPlugin/libmesh5.h [deleted file]
src/GUI/GHS3DPluginGUI_Enums.h
src/GUI/GHS3DPluginGUI_HypothesisCreator.cxx
src/GUI/GHS3DPluginGUI_HypothesisCreator.h
src/GUI/GHS3DPlugin_msg_en.ts
src/GUI/GHS3DPlugin_msg_fr.ts