NRI : Merge from V1_2.

diff --git a/bin/VERSION b/bin/VERSION
index 9eeec826da02c736c133a8f655480adad05bc4c5..7e17d7f76203e9b902e8da56ddf9d1b9bd2d5cb5 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME PRO - VISU VERSION: 1.1a
+THIS IS SALOME PRO - VISU VERSION: 1.2

diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index dc57fa5c97610558b4f915e8a8c4eacf0542c931..d31c61fe815df69e2f869eb78d1cdae76b02f842 100755 (executable)
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,8 +3,8 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME PRO - VISU - v.1.1a"
-PROJECT_NUMBER         = id#1.0
+PROJECT_NAME           = "SALOME PRO - VISU - v.1.2"
+PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English
 EXTRACT_ALL            = YES