summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-03-03 20:13:07 +0000
committerzhangw <zhangw@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2006-03-03 20:13:07 +0000
commitd6662166d60e65e04175eb209475755a8a42d346 (patch)
tree7c6c3f8020604541543823ac4e1a7bcbe91e1262
parent67d886b9cd878bb3a2375baac7c082c355308e74 (diff)
downloadATCD-d6662166d60e65e04175eb209475755a8a42d346.tar.gz
revert due to release failure
-rw-r--r--ChangeLog4
-rw-r--r--PROBLEM-REPORT-FORM2
-rw-r--r--TAO/CIAO/ChangeLog4
-rw-r--r--TAO/ChangeLog4
-rw-r--r--TAO/PROBLEM-REPORT-FORM4
-rw-r--r--TAO/VERSION2
-rw-r--r--TAO/tao/Version.h4
-rw-r--r--VERSION2
-rw-r--r--ace/Version.h4
9 files changed, 9 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index 7f814aebe2d..be8b3ea9526 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-Fri Mar 03 12:39:33 2006 Wallace Zhang <zhangw@ociweb.com>
-
- * ACE version 5.4.11 released.
-
Thu Mar 2 02:01:12 UTC 2006 Wallace Zhang <zhangw@ociweb.com>
* NEWS:
diff --git a/PROBLEM-REPORT-FORM b/PROBLEM-REPORT-FORM
index a01e37d6a2c..aec935afab0 100644
--- a/PROBLEM-REPORT-FORM
+++ b/PROBLEM-REPORT-FORM
@@ -43,7 +43,7 @@
To: ace-bugs@cs.wustl.edu
Subject: [area]: [synopsis]
- ACE VERSION: 5.4.11
+ ACE VERSION: 5.4.10
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog
index 724f25eaaf6..bc035681ffd 100644
--- a/TAO/CIAO/ChangeLog
+++ b/TAO/CIAO/ChangeLog
@@ -1,7 +1,3 @@
-Fri Mar 03 12:46:54 2006 Wallace Zhang <zhangw@ociweb.com>
-
- * CIAO version 0.4.11 released.
-
Thu Mar 2 17:50:36 UTC 2006 Boris Kolpackov <boris@kolpackov.net>
* CCF/CCF/IDL2/SemanticGraph/Struct.cpp:
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 6787ccb8060..22ab412695d 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,7 +1,3 @@
-Fri Mar 03 12:42:58 2006 Wallace Zhang <zhangw@ociweb.com>
-
- * TAO version 1.4.11 released.
-
Fri Mar 3 17:09:34 UTC 2006 Wallace Zhang <zhangw@ociweb.com>
* NEWS:
diff --git a/TAO/PROBLEM-REPORT-FORM b/TAO/PROBLEM-REPORT-FORM
index e4bb7adf13c..72992d175cf 100644
--- a/TAO/PROBLEM-REPORT-FORM
+++ b/TAO/PROBLEM-REPORT-FORM
@@ -43,8 +43,8 @@
To: tao-bugs@cs.wustl.edu
Subject: [area]: [synopsis]
- TAO VERSION: 1.4.11
- ACE VERSION: 5.4.11
+ TAO VERSION: 1.4.10
+ ACE VERSION: 5.4.10
HOST MACHINE and OPERATING SYSTEM:
If on Windows based OS's, which version of WINSOCK do you
diff --git a/TAO/VERSION b/TAO/VERSION
index 850fbed8964..35e6a3ab757 100644
--- a/TAO/VERSION
+++ b/TAO/VERSION
@@ -1,4 +1,4 @@
-This is TAO version 1.4.11, released Fri Mar 03 12:42:58 2006.
+This is TAO version 1.4.10, released Mon Feb 20 05:17:29 2006.
If you have any problems with or questions about TAO, please send
e-mail to the TAO mailing list (tao-users@cs.wustl.edu), using the
diff --git a/TAO/tao/Version.h b/TAO/tao/Version.h
index 05a3c58df9d..495c3a31dcc 100644
--- a/TAO/tao/Version.h
+++ b/TAO/tao/Version.h
@@ -5,5 +5,5 @@
#define TAO_MAJOR_VERSION 1
#define TAO_MINOR_VERSION 4
-#define TAO_BETA_VERSION 11
-#define TAO_VERSION "1.4.11"
+#define TAO_BETA_VERSION 10
+#define TAO_VERSION "1.4.10"
diff --git a/VERSION b/VERSION
index 01215407436..4cd23e324e1 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 5.4.11, released Fri Mar 03 12:39:33 2006.
+This is ACE version 5.4.10, released Mon Feb 20 05:13:42 2006.
If you have any problems with or questions about ACE, please send
email to the ACE mailing list (ace-users@cs.wustl.edu), using the form
diff --git a/ace/Version.h b/ace/Version.h
index 7fda9590262..b536b830028 100644
--- a/ace/Version.h
+++ b/ace/Version.h
@@ -5,6 +5,6 @@
#define ACE_MAJOR_VERSION 5
#define ACE_MINOR_VERSION 4
-#define ACE_BETA_VERSION 11
-#define ACE_VERSION "5.4.11"
+#define ACE_BETA_VERSION 10
+#define ACE_VERSION "5.4.10"