From: nadir <nadir>
Date: Mon, 8 Dec 2003 14:23:20 +0000 (+0000)
Subject: updating with the main trunk version !!
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=253e7b17646a20d9760f1673be19173b28d08d38;p=modules%2Fsmesh.git

updating with the main trunk version !!
---

diff --git a/INSTALL b/INSTALL
index 41ea5bea4..4c8ea6667 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,4 +1,4 @@
-This is SMESH V1_3_0
+This is SMESH V1_3_1
 
 Compatible with :
 	GEOM	V1_3_0
diff --git a/bin/VERSION b/bin/VERSION
index 3fa3a6799..126a406d5 100755
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1,2 @@
-THIS IS SALOME PRO - SMESH VERSION: 1.2
+THIS IS SALOME - SMESH VERSION: 1.3.1
+
diff --git a/cvs-tags b/cvs-tags
index a26df3679..ec96d5753 100644
--- a/cvs-tags
+++ b/cvs-tags
@@ -7,3 +7,23 @@ V1_2_1:	?
 V1_2_2:	2003-09-26 17:00
 	New data structure in SMDS.
 
+nadir_1_2_2: 2003-10-06 12:50
+	Branch after V1_2_2. Developpement branch for user nadir
+
+merge_1_2_c__1_2_2: 2003-10-17 14:35
+	Branch after V1_2_2. Branch to merge Salome 1.2c. Initiated by Paul Rascle.
+
+MergeV1_2c-1: 2003-10-19 13:49
+	End of merge_1_2_c__1_2_2 branch. This branch is ready to be merge with the head.
+
+V1_3_0b1: 2003-11-12
+	First pre-release of 1.3.0. Include the merge of 1.2c branch.
+
+nadir_update_MED_v1_3_0: 2003-11-17 10:22
+	New branch for user nadir. Synchronization of API with MED 1.3.
+
+V1_3_0b2: 2003-11-18
+	Second pre-release of 1.3.0. Synchronization of API with MED 1.3.
+
+V1_3_0: 2003-11-25 08:52
+	Release 1.3.0.
diff --git a/doc/html/INPUT/doxyfile b/doc/html/INPUT/doxyfile
index 195d2ce75..9e1e6eb0e 100755
--- a/doc/html/INPUT/doxyfile
+++ b/doc/html/INPUT/doxyfile
@@ -3,7 +3,7 @@
 #---------------------------------------------------------------------------
 # General configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "SALOME PRO - SMESH - v.1.2"
+PROJECT_NAME           = "SALOME - SMESH - v.1.3.0"
 PROJECT_NUMBER         = id#1.1
 OUTPUT_DIRECTORY       = ../
 OUTPUT_LANGUAGE        = English
@@ -99,11 +99,11 @@ GENERATE_HTMLHELP      = NO
 CHM_FILE               = 
 HHC_LOCATION           = 
 GENERATE_CHI           = NO
-BINARY_TOC             = NO
-TOC_EXPAND             = NO
-DISABLE_INDEX          = NO
+BINARY_TOC             = YES
+TOC_EXPAND             = YES
+DISABLE_INDEX          = YES
 ENUM_VALUES_PER_LINE   = 4
-GENERATE_TREEVIEW      = NO
+GENERATE_TREEVIEW      = YES
 TREEVIEW_WIDTH         = 250
 #---------------------------------------------------------------------------
 # configuration options related to the LaTeX output
diff --git a/doc/html/Makefile.in b/doc/html/Makefile.in
index d52af4892..9a87b93ab 100644
--- a/doc/html/Makefile.in
+++ b/doc/html/Makefile.in
@@ -6,6 +6,7 @@
 #
 # source path
 top_srcdir=@top_srcdir@
+root_srcdir=@ROOT_SRCDIR@
 top_builddir=../..
 srcdir=@srcdir@
 VPATH=.:@srcdir@
@@ -16,11 +17,11 @@ doxygen=@DOXYGEN@
 doc:
 	cp -fr $(srcdir)/INPUT ./; \
 	cd INPUT; \
-	sed 's|../../../share/salome|../$(top_srcdir)|' doxyfile > doxyfile1; \
+	sed 's|../../../share/salome|$(root_srcdir)|' doxyfile > doxyfile1; \
 	mv -f doxyfile1 doxyfile; \
 	$(doxygen) ./doxyfile; \
 	cd ..; \
-	cp -f $(srcdir)/INPUT/sources/doxygen.css ./html/doxygen.css
+	cp -fr $(srcdir)/INPUT/sources/static/*.* ./html/
 	cp -fr $(srcdir)/INPUT/sources/ html/
 	cp -fr $(srcdir)/INPUT/HTML/  html/