summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralex <alex@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-09 04:20:46 +0000
committeralex <alex@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-07-09 04:20:46 +0000
commita5a0be58b9f135db47bc21a10686e2428e0947ec (patch)
treeace04c59bfeb7e676c3a796fe900d2669694e0c2
parent8dd7df7bc379f782c273ca6182f93cccef5ae8fa (diff)
downloadATCD-a5a0be58b9f135db47bc21a10686e2428e0947ec.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-99b7
-rw-r--r--TAO/ChangeLog-99c3
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog-99b b/ChangeLog-99b
index 0fe5e0cb7e1..d6e217d95eb 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,10 @@
+Thu Jul 8 23:15:06 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu>
+
+ Merging the "ami_phase3" branch on to the main branch. Change
+ was done to the CDR_Stream{h,i} files to add the method
+ <byte_order> to the CDR class. Other than that, no change was
+ done to ACE.
+
Thu Jul 08 22:15:50 1999 David L. Levine <levine@cs.wustl.edu>
* docs/ACE-guidelines.html: changed the perl magic that
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 9e93a7ce854..8e68f01a923 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -6,7 +6,8 @@ Thu Jul 8 22:55:59 1999 Alexander Babu Arulanthu <alex@cs.wustl.edu>
between the "ami_phase3" branch and the current branch.
Most of the support for the AMI Callback is added. But all the
- AMI specific code is commented out using "TAO_HAS
+ AMI specific code is commented out using
+ "TAO_HAS_CORBA_MESSAGING" and "TAO_POLLER".
Thu Jul 8 21:50:02 1999 Carlos O'Ryan <coryan@cs.wustl.edu>