summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2003-08-28 02:45:46 +0000
committerbala <balanatarajan@users.noreply.github.com>2003-08-28 02:45:46 +0000
commitd48160a57f1124c90963dfed9558f6e196b0abad (patch)
tree6b49085a0aeb1db941c5d3315aae94d4bb14457b
parent9a60d8d933d862eb22a4bd920ec48d73621a5a17 (diff)
downloadATCD-d48160a57f1124c90963dfed9558f6e196b0abad.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 65d9a32c251..f8374f7c99b 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -70,7 +70,6 @@ Wed Aug 27 14:48:17 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
Fixed warning about potential use of an uninitialized variable.
->>>>>>> 1.2448
Wed Aug 27 14:11:35 2003 Venkita Subramonian <venkita@cs.wustl.edu>
* orbsvcs/orbsvcs/RTSched.dsp: