update

diff --git a/ChangeLog b/ChangeLog
index 46cf0c99215365ade05a5bc57976e0487d492aa4..efa1196137d8fa1cdce933185a2e9ed7bbaea5f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,25 @@
 ###############################################################################
 #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-03-23 11:40  tag V1_4_0
+
+2004-03-23 11:38  Jerome Robert <jerome.robert@eads.net>
+
+       * src/SMESHGUI/SMESHGUI.cxx (V1_4_0_branch): Add a MEDFILE attribut
+         for selection in Efficas. Patch submited by P. Rascle on
+         2004-03-22.
+       * src/SMDS/SMDS_Position.cxx (V1_4_0_branch): Fix bug SMESH5512
+         (Crash on DEBIAN woody, V1_4_0b).
+       * src/SMESHGUI/SMESHGUI_Swig.cxx (V1_4_0_branch): Fix bug
+         SMESH5451: SMESH_mechanic script aborts.
+
+2004-01-30 15:42  tag V1_4_0_branch
+
+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

diff --git a/cvs-tags b/cvs-tags
index 6991d061f58b8ae1c4962a250f778de607a99909..d0133c16ec1be4e716e70a3c24ed59b6b138833c 100644 (file)
--- a/cvs-tags
+++ b/cvs-tags
@@ -33,3 +33,13 @@ V1_3_1: 2004-01-05 14:28
 
 merge_1_2_d: 2003-01-20 11:25
        Branch to merge Release 1.2d of Salome Pro.
+
+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_0_branch: 2004-01-30 15:42
+       Maintenance branch for 1.4.0. This tag is equal to V1_4_0b.
+
+V1_4_0: 2004-03-23 11:40
+       Release 1.4.0. Tag on V1_4_0_branch branch.
+