From: nri Date: Fri, 11 Jul 2003 07:33:03 +0000 (+0000) Subject: NRI : Merge from V1_2. X-Git-Tag: V1_2_1~2 X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=687a3ca0b15344d6cce83e0f4c95f2222d8349ac NRI : Merge from V1_2. --- diff --git a/bin/VERSION b/bin/VERSION index 64c155a44..3fa3a6799 100755 --- 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 f9f6dd732..195d2ce75 100755 --- 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 6b636a242..d52af4892 100644 --- 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: