update for V1_3_0_b2

diff --git a/ChangeLog b/ChangeLog
index 9271877598c2270d2400132a42ec7e305d42ebd8..ae7ee1097e7ec81818baedae12f534b47b01b637 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,10 +1,27 @@
 ###############################################################################
 #This is the SMESH change log. Do not modify because it is automatically
 #created with :
-#cvs2cl.pl -l "-b -rmerge_1_2_c__1_2_2" -U users.cvs2cl --header header.cvs2cl \
-# -T -b --utc
+#cvs2cl.pl -l "-b" -U users.cvs2cl --header header.cvs2cl -T -b --utc
 ###############################################################################
 
+2003-11-18 09:19  Nadir Bouhamou <nadir.bouhamou@cea.fr>
+
+       * src/SMESH_I/: SMESH_MEDFamily_i.cxx, SMESH_MEDFamily_i.hxx,
+       SMESH_MEDMesh_i.cxx, SMESH_MEDMesh_i.hxx, SMESH_MEDSupport_i.cxx,
+       SMESH_MEDSupport_i.hxx: merge with the branch
+       nadir_update_MED_v1_3_0 (branch to build the V1_3_0 version of the
+       module.
+
+2003-11-17 09:22  Jerome Robert <jerome.robert@eads.net>
+
+       * cvs-tags: update
+
+2003-11-12 13:20  tag V1_3_0_b1
+
+2003-11-12 13:20  Jerome Robert <jerome.robert@eads.net>
+
+       * ChangeLog, INSTALL, cvs-tags, bin/VERSION: Update for V1.3.0b1
+
 2003-11-12 11:40  Jerome Robert <jerome.robert@eads.net>
 
        * src/OBJECT/SMESH_Actor.cxx: MergeV1_2c-1
@@ -41,13 +58,6 @@
        some dialogs were cropped at the bottom of the screen. It's now
        fixed.
 
-2003-10-19 11:49  tag MergeV1_2c-1
-
-2003-10-19 11:49  Paul Rascle <paul.rascle@edf.fr>
-
-       * src/: OBJECT/SMESH_Actor.cxx, SMESHGUI/SMESHGUI.cxx
-       (merge_1_2_c__1_2_2): PR: Merge V1_2c - step 1
-
 2003-10-17 16:31  Jerome Robert <jerome.robert@eads.net>
 
        * src/SMDS/SMDS_Mesh.cxx: Fix a bug. Quadrangles were added as
@@ -107,6 +117,8 @@
        * adm_local/unix/config_files/check_Netgen.m4: file check_Netgen.m4
        was initially added on branch nadir_1_2_2.
 
+2003-10-06 10:50  tag MergeV1_2c-1
+
 2003-10-06 10:50  Jerome Robert <jerome.robert@eads.net>
 
        * cvs-tags: Update. Created a new branch for user nadir.

diff --git a/INSTALL b/INSTALL
index 0cfee088d4c023acf0e2bbda2b0512e57fdccaa0..a8ce8e6069b88ed84f2d6ebdc0d66649242c1fc3 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
-This is SMESH V1_3_0_b1
+This is SMESH V1_3_0_b2
 
 Compatible with :
        GEOM    "2003/11/06 16:33:45 UTC"
        KERNEL  V1_3_0_b2
-       MED             MergeV1_2c-1
+       MED             V1_3_0_b1

diff --git a/cvs-tags b/cvs-tags
index f6153ac71f3daa86588183ea1ff353fd9e45cc54..e41518bebd2a7242a06f0a24b597d0e612572de1 100644 (file)
--- a/cvs-tags
+++ b/cvs-tags
@@ -22,3 +22,6 @@ V1_3_0b1: 2003-11-12
 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.
+