Merging with WPdev

diff --git a/Makefile.in b/Makefile.in
index 6c30a8f7ee4932b1ec2b61f5aff866b1afc135b3..c29027f8f2ea6adfc0314ef4e1a4b837217e03a4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,4 +101,4 @@ distclean-other:
 
 @MODULE@
 
-install: install-bin
\ No newline at end of file
+install: install-bin

diff --git a/configure.in.base b/configure.in.base
index 68a341edf7717941e933ed6a8a26a2f50ab29f33..9a4439bb476e1c84e72ab7d8876c1cacda5af001 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/dev_guide.pdf b/doc/dev_guide.pdf
index bc7b7f9fd7561ce24f4412be7055b1298d4b75df..8c363922feaa4e287ff32b7da6ae32ce0295367c 100644 (file)
Binary files a/doc/dev_guide.pdf and b/doc/dev_guide.pdf differ