NRI : Merge from V1_2.

diff --git a/bin/VERSION b/bin/VERSION
index 64c155a4485b63d67c314938aad512c48f0668d7..3fa3a679939f2cc1ae78dd47b15f1d716a236435 100755 (executable)
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME PRO - SMESH VERSION: 1.1a
+THIS IS SALOME PRO - SMESH VERSION: 1.2

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

diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index 6b636a242121ce8b4e90d2391361c730eb6ea185..d52af489287cb31c7b5f21d1c987fabd89a47dc5 100644 (file)
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -22,7 +22,6 @@ doc:
        cd ..; \
        cp -f $(srcdir)/INPUT/sources/doxygen.css ./html/doxygen.css
        cp -fr $(srcdir)/INPUT/sources/ html/
-       cp -fr $(srcdir)/INPUT/exemple/ html/
        cp -fr $(srcdir)/INPUT/HTML/  html/
 
 clean: