summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAngelo Corsaro <angelo@icorsaro.net>2001-06-19 17:36:44 +0000
committerAngelo Corsaro <angelo@icorsaro.net>2001-06-19 17:36:44 +0000
commitd717add1d980ec78505af06669ad6bb3a09c8bf0 (patch)
treec0115b87429f5e6c70e53417da956a38e64b0585
parente15f14f3239d113551ece3dcad7fb6259de65208 (diff)
downloadATCD-d717add1d980ec78505af06669ad6bb3a09c8bf0.tar.gz
ChangeLogTag: Tue Jun 19 12:27:39 2001 Angelo Corsaro <corsaro@cs.wustl.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 2bf15e6d8b4..f1404c1f7c1 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -41,7 +41,6 @@ Tue Jun 19 12:25:09 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
Added RTCORBA includes and added the RTCORBA library to
client.dsp.
->>>>>>> 1.3796
Tue Jun 19 10:38:07 2001 Frank Hunleth <fhunleth@cs.wustl.edu>
* tests/RTCORBA/Server_Protocol/client.cpp: