summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-09 16:02:29 +0000
committerparsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2003-05-09 16:02:29 +0000
commit515dc88263e10b803a59212f5a5663c1766fe335 (patch)
tree8915c48b6d1fb74cc049330f1b4391c5678cf5cb
parent5663efbc3983a777b56c9743bbbfcaa968345e6a (diff)
downloadATCD-515dc88263e10b803a59212f5a5663c1766fe335.tar.gz
ChangeLogTag: Fri May 9 10:42:37 2003 Jeff Parsons <j.parsons@vanderbilt.edu>
>>>>>>>
-rw-r--r--TAO/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 01cce2e3782..f85f1cd77df 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -41,7 +41,6 @@ Fri May 9 12:41:33 UTC 2003 Johnny Willemsen <jwillemsen@remedy.nl>
* examples/AMH/Sink_Server/client.bor:
Fixed these BCB makefiles
->>>>>>> 1.1738
Fri May 09 10:17:47 2003 Simon McQueen <sm@prismtechnologies.com>
* docs/tutorials/Quoter/AMI/client.dsp: