diff options
| author | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-30 16:53:43 +0000 |
|---|---|---|
| committer | vzykov <vzykov@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2009-10-30 16:53:43 +0000 |
| commit | f9c3727738c49db0f7e913b4743ebfd11733cd0c (patch) | |
| tree | 6ebfa047207e0255c35e83c5d45c1f965a01c06d | |
| parent | b39170b38c872b6c295e7bb7f56123d5f7c199cc (diff) | |
| download | ATCD-f9c3727738c49db0f7e913b4743ebfd11733cd0c.tar.gz | |
| -rw-r--r-- | TAO/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f12a194be0d..0ede84c6a77 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -481,7 +481,6 @@ Mon Oct 26 10:52:01 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com> * tao/Acceptor_Impl.cpp: Uncommented code for a fix for bug#3748. ->>>>>>> .r87276 Thu Oct 22 10:47:21 UTC 2009 Johnny Willemsen <jwilllemsen@remedy.nl> * TAO_IDL/TAO_IDL_ACE.mwc: |