NRI : Merge BRANCH_V1_2c

diff --git a/bin/VERSION b/bin/VERSION
index 9e100c4dc947dd003d48677ff699b150cc96d939..6156fe3ca3c4cafc95b06e9ee9ae19bed9cd96f8 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME PRO - GEOM VERSION: 1.3.0
+THIS IS SALOME - GEOM VERSION: 1.3.0

diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 940499479292edaf46a387604b7be40047b11cc2..021c0f7cd8d0496cf81510dc634fb84730a7ee93 100755 (executable)
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME PRO - GEOM - v.1.3.0"
+PROJECT_NAME           = "SALOME - GEOM - v.1.3.0"
 PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English

diff --git a/doc/html/INPUT/sources/application.gif b/doc/html/INPUT/sources/application.gif
index 10da488d2dcf2a063029d868686e1882e45487ab..0b05d5c18ee88779d283508781836e2b151f606f 100644 (file)
Binary files a/doc/html/INPUT/sources/application.gif and b/doc/html/INPUT/sources/application.gif differ