update

diff --git a/ChangeLog b/ChangeLog
index ab738f5490944cc106c80b43f2ade0fcf1587e5d..63644e2bdbcac0f07dfc32994d690e8f9097b2d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,10 @@
 #cvs2cl.pl --accum -l "-b" -U users.cvs2cl --header header.cvs2cl -T -b --utc
 ###############################################################################
 
+2004-03-15 18:42  Jerome Robert <jerome.robert@eads.net>
+
+       * Merge br_enable_import_mesh. Enable import mesh and save/load SMESH study.
+
 2004-02-02 16:43  Jerome Robert <jerome.robert@eads.net>
 
        * src/SMDS/SMDS_Mesh.cxx: Fix a bug (crash when adding an

diff --git a/cvs-tags b/cvs-tags
index c6be26182a9c249205d5b98298c4f0b3e56bd8ea..6e2f8ca526db0cadfa98c86adba091aad72d9604 100644 (file)
--- a/cvs-tags
+++ b/cvs-tags
@@ -37,9 +37,8 @@ merge_1_2_d: 2003-01-20 11:25
 V1_4_0b: 2004-01-30 15:42
        Pre-release of 1.4.0. Include the merge of the branch merge_1_2_d.
 
-br_enable_import_mesh: 2004-02-16 10:12
-       New branch on head, after V1_4_0b. Do improvement on mesh file import.
-       
-br_geomclient_colocal: 2004-02-16 14:10
-       New branch on br_enable_import_mesh. Initiated by Francis Kloss.
+br_enable_import_mesh: 2004-02-16 10:00
+       Branch on head after V1_4_0b. Development branch enable import mesh and save/load SMESH study. Initiated by Jerome Robert.
 
+br_geomclient_colocal: 2004-02-23 10:00
+       Branch on br_enable_import_mesh. Development branch for colocalization. Initiated by Francis KLOSS.