summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
authormarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-10-12 03:43:29 +0000
committermarina <marina@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-10-12 03:43:29 +0000
commit4839a78c4a1e9868c0b40d5c9eb801939e932683 (patch)
tree9ea2bac1d8a95b7c25c71b094a0099d18ceaf7a4 /TAO
parent0fd9b871decb431a6615c6ec8ca1d901431d8b3d (diff)
downloadATCD-4839a78c4a1e9868c0b40d5c9eb801939e932683.tar.gz
*** empty log message ***
Diffstat (limited to 'TAO')
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a8
1 files changed, 7 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 4fb0752fc35..605dcd37e4f 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Wed Oct 11 22:39:59 2000 Marina Spivak <marina@cs.wustl.edu>
+
+ * orbsvcs/orbsvcs/SSLIOP_Profile.cpp:
+
+ Removed duplicate definition of <encode_endpoints> method left
+ from the previous modification.
+
Wed Oct 11 19:13:23 2000 Ossama Othman <ossama@uci.edu>
* tao/ORB_Core.cpp (fini):
@@ -222,7 +229,6 @@ Tue Oct 10 16:59:18 2000 Nanbor Wang <nanbor@cs.wustl.edu>
files. Many of these static project configurations were
completely broken.
->>>>>>> 1.1678
Tue Oct 10 14:52:16 2000 Jeff Parsons <parsons@cs.wustl.edu>
* tao/Any.h: