summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOssama Othman <ossama-othman@users.noreply.github.com>1999-09-22 18:16:07 +0000
committerOssama Othman <ossama-othman@users.noreply.github.com>1999-09-22 18:16:07 +0000
commit6344bc5f6ea889b15af2d9f3f8b2d54e17afe59a (patch)
treeb9715bda2c67be2c62335f4e6bf3037c3fd3681b
parente4bda8f0740c7355d22b5ec576affb3610e9f86b (diff)
downloadATCD-6344bc5f6ea889b15af2d9f3f8b2d54e17afe59a.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-99c10
1 files changed, 0 insertions, 10 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 2e569e2c23d..8f885ae5d40 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -41,21 +41,11 @@ Mon Sep 22 01:15:00 1999 Michael Kircher <Michael.Kircher@mchp.siemens.de>
Added the ACE_RCSID.
Tue Sep 21 23:29:30 1999 Mike Moran <mm4@cs.wustl.edu>
-<<<<<<< ChangeLog
* tests/Explicit_Event_Loop:
-=======
-
- * tests/Explicit_Event_Loop/:
->>>>>>> 1.2870
-<<<<<<< ChangeLog
Added ACE_TRY macros so the test will run without exceptions=1,
and enhanced the documentation and ACE-style compliance.
-=======
- Added ACE_TRY macros so the test will run without exceptions=1,
- and enhanced the documentation and ACE-style compliance.
->>>>>>> 1.2870
Tue Sep 21 22:06:10 1999 Ossama Othman <othman@cs.wustl.edu>