update

diff --git a/ChangeLog b/ChangeLog
index 46cf0c99215365ade05a5bc57976e0487d492aa4..ab738f5490944cc106c80b43f2ade0fcf1587e5d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,16 @@
 ###############################################################################
 #This is the SMESH change log. Do not modify because it is automatically
 #created with :
 ###############################################################################
 #This is the SMESH change log. Do not modify because it is automatically
 #created with :

-#cvs2cl.pl -l "-b" -U users.cvs2cl --header header.cvs2cl -T -b --utc
+#cvs2cl.pl --accum -l "-b" -U users.cvs2cl --header header.cvs2cl -T -b --utc

 ###############################################################################
 
 ###############################################################################
 

+2004-02-02 16:43  Jerome Robert <jerome.robert@eads.net>
+
+       * src/SMDS/SMDS_Mesh.cxx: Fix a bug (crash when adding an
+         hexahedron from ids).
+
+2004-01-30 15:42  tag V1_4_0b
+

 2004-01-30 13:18  Nicolas Rejneri <nicolas.rejneri@opencascade.com>
 
        * doc/html/INPUT/: doxyfile, sources/static/tree.js: NRI : 1.4.0
 2004-01-30 13:18  Nicolas Rejneri <nicolas.rejneri@opencascade.com>
 
        * doc/html/INPUT/: doxyfile, sources/static/tree.js: NRI : 1.4.0

diff --git a/cvs-tags b/cvs-tags
index 6f98198f9d18cbfb12cd109ac4b1070e377a6553..c6be26182a9c249205d5b98298c4f0b3e56bd8ea 100644 (file)
--- a/cvs-tags
+++ b/cvs-tags
@@ -36,3 +36,10 @@ 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.
 
 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.
+