summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-29 22:17:57 +0000
committerdoccvs <doccvs@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-06-29 22:17:57 +0000
commit0fa5aa210a035792ebb7c7db0162ec850be6c91e (patch)
tree5f294108e1247e81940c93de62e81d19afe68249
parent92485cfbe7a209f2628f4acfbf2b5c9e9e1f15f8 (diff)
downloadATCD-0fa5aa210a035792ebb7c7db0162ec850be6c91e.tar.gz
ChangeLogTag: Thu Jun 29 15:13:50 2000 Priyanka Gontla <pgontla@ece.uci.edu>
-rw-r--r--TAO/ChangeLogs/ChangeLog-02a1
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index d8542c7f44d..1eeab73c142 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -79,7 +79,6 @@ Tue Jun 27 10:45:17 2000 Priyanka Gontla <pgontla@ece.uci.edu>
* tao/ORB.cpp :
Removed the file_string_to_object function as it is no longer
needed.
->>>>>>> 1.996.2.6
Mon Jun 26 14:56:42 2000 Carlos O'Ryan <coryan@uci.edu>