Merging with WPdev

diff --git a/Makefile.in b/Makefile.in
index 5c579e676b51720f6d19cc279ddd5d421377206d..f5cf75a217a8c665865d3e8636dfec62dd200326 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -163,7 +163,20 @@ mesh_quad_tetrahedron.png \
 mesh_quad_pyramid.png \
 mesh_quad_pentahedron.png \
 mesh_quad_hexahedron.png \
-mesh_conv_to_quad.png
+mesh_conv_to_quad.png \
+mesh_tree_hypo_layers_distribution.png \
+mesh_tree_algo_radial_prism.png \
+mesh_tree_algo_projection_3d.png \
+mesh_tree_algo_projection_2d.png \
+mesh_hypo_source_edge.png \
+mesh_hypo_source_3d.png \
+mesh_hypo_layer_distribution.png \
+mesh_hypo_source_face.png \
+mesh_tree_hypo_source_face.png \
+mesh_tree_hypo_source_edge.png \
+mesh_tree_hypo_source_3d_shape.png \
+mesh_tree_hypo_projection_3d.png \
+mesh_tree_hypo_projection_2d.png \
 
 BIN_SCRIPT= \
 VERSION

diff --git a/configure.in.base b/configure.in.base
index 92cad35ecd9c697bb55ef45f309945025163e2da..28f7ffb998f018182b5d1693c3047ccdfe3407b3 100644 (file)
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,8 +22,8 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.2
-XVERSION=0x030202
+VERSION=3.2.4
+XVERSION=0x030204
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 

diff --git a/doc/salome/AddNetgenInSalome2.pdf b/doc/salome/AddNetgenInSalome2.pdf
index 34fd25204d7f2506a236b2629cfd6157ad7c1936..d736a6ded9ab54cd3b0cccc654a7869ab7d8ece4 100644 (file)
Binary files a/doc/salome/AddNetgenInSalome2.pdf and b/doc/salome/AddNetgenInSalome2.pdf differ

diff --git a/doc/salome/PluginMeshers.txt b/doc/salome/PluginMeshers.txt
index 802f096effcfc208783435917e1006efef01d8a3..71e58b2e77ade0bbf727e450a788a328fd2bfc7d 100644 (file)
--- a/doc/salome/PluginMeshers.txt
+++ b/doc/salome/PluginMeshers.txt
@@ -185,4 +185,4 @@ Note: If you use runSalome.py script from KERNEL package to launch SALOME, you m
           </module>
           ...
       </modules-list>
-      ...
\ No newline at end of file
+      ...