From 4b8b3b4a281e64c16ceaa81647631c6e3bf1c730 Mon Sep 17 00:00:00 2001
From: abd <abd@opencascade.com>
Date: Wed, 7 Feb 2007 11:58:38 +0000
Subject: [PATCH] Merging with WPdev

---
 Makefile.in                       |  15 ++++++++++++++-
 configure.in.base                 |   4 ++--
 doc/salome/AddNetgenInSalome2.pdf | Bin 70678 -> 70677 bytes
 doc/salome/PluginMeshers.txt      |   2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 5c579e676..f5cf75a21 100644
--- 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 92cad35ec..28f7ffb99 100644
--- 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
GIT binary patch
delta 14
WcmbQXf@SIomJKV7Hm@?uc?bY8)&}bU

delta 16
YcmbQbf@RtYmJKV77<o6ZG|G7h06Ibj_y7O^

diff --git a/doc/salome/PluginMeshers.txt b/doc/salome/PluginMeshers.txt
index 802f096ef..71e58b2e7 100644
--- 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
+      ...
-- 
2.39.2